summaryrefslogtreecommitdiffstats
path: root/sysutils/gnome-system-tools
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-03-11 05:25:54 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-03-11 05:25:54 +0800
commit1631878dcfe74cb9b322b341727559c534b09f77 (patch)
tree48f48a1ed3673a87e1badb7a2111c3e5f53e66e2 /sysutils/gnome-system-tools
parent5d5b0e6346db1248ec30fe02a89675c2bb06d179 (diff)
downloadmarcuscom-ports-1631878dcfe74cb9b322b341727559c534b09f77.tar
marcuscom-ports-1631878dcfe74cb9b322b341727559c534b09f77.tar.gz
marcuscom-ports-1631878dcfe74cb9b322b341727559c534b09f77.tar.bz2
marcuscom-ports-1631878dcfe74cb9b322b341727559c534b09f77.tar.lz
marcuscom-ports-1631878dcfe74cb9b322b341727559c534b09f77.tar.xz
marcuscom-ports-1631878dcfe74cb9b322b341727559c534b09f77.tar.zst
marcuscom-ports-1631878dcfe74cb9b322b341727559c534b09f77.zip
Add some patches that should get g-s-t working under 5.X and 6.X again.
I can't figure out the 4.X issues, though. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3916 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/gnome-system-tools')
-rw-r--r--sysutils/gnome-system-tools/Makefile2
-rw-r--r--sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c18
-rw-r--r--sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c11
3 files changed, 30 insertions, 1 deletions
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 86a6f4199..1dca8a647 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomesystemtools
PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.2
diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c
new file mode 100644
index 000000000..9272d9181
--- /dev/null
+++ b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c
@@ -0,0 +1,18 @@
+--- src/common/gst-auth.c.orig Thu Mar 10 14:39:18 2005
++++ src/common/gst-auth.c Thu Mar 10 14:39:50 2005
+@@ -142,12 +142,12 @@ gst_auth_run_term (GstTool *tool, gchar
+ unsetenv("LANG");
+ unsetenv("LANGUAGE");
+
+- dup2 (p[1], 1);
+- dup2 (p[1], 2);
++ dup2 (p[1], STDOUT_FILENO);
++ /*dup2 (p[1], 2);*/
+ close (p[0]);
+
+ execv (args[0], args);
+- exit (255);
++ _exit (255);
+ } else {
+ #ifndef __FreeBSD__
+ /* Linux's su works ok with echo disabling */
diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c
new file mode 100644
index 000000000..5134f30e5
--- /dev/null
+++ b/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c
@@ -0,0 +1,11 @@
+--- src/common/gst-tool.c.orig Thu Mar 10 14:39:54 2005
++++ src/common/gst-tool.c Thu Mar 10 14:40:00 2005
+@@ -1653,7 +1653,7 @@ poll_backend (GstTool *tool)
+ struct pollfd fd;
+
+ fd.fd = tool->read_fd;
+- fd.events = POLLIN || POLLPRI;
++ fd.events = POLLIN | POLLPRI;
+
+ while (poll (&fd, 1, 100) <= 0) {
+ while (gtk_events_pending ())