summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-misc/fbpanel/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-misc/fbpanel/files')
-rw-r--r--x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch15
-rw-r--r--x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch13
2 files changed, 28 insertions, 0 deletions
diff --git a/x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch b/x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch
new file mode 100644
index 000000000000..74c04d55f76d
--- /dev/null
+++ b/x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch
@@ -0,0 +1,15 @@
+--- a/scripts/custom.sh
++++ b/scripts/custom.sh
+@@ -18,10 +18,10 @@
+ add_feature dependency "disable dependency tracking" disabled
+
+ add_var glib_cflags "glib cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags glib-2.0`'
+-add_var gtk_cflags "gtk cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags gtk+-2.0`'
++add_var gtk_cflags "gtk cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags gtk+-2.0 x11`'
+
+ add_var glib_libs "glib libs" '`RFS=$rfs scripts/rfs-pkg-config --libs glib-2.0`'
+-add_var gtk_libs "gtk libs" '`RFS=$rfs scripts/rfs-pkg-config --libs gtk+-2.0`'
++add_var gtk_libs "gtk libs" '`RFS=$rfs scripts/rfs-pkg-config --libs gtk+-2.0 x11` -lm'
+
+ add_var cflagsx "C flags" '-I$topdir/panel $glib_cflags $gtk_cflags -fPIC'
+ add_var ldflagsx "linker flags" '$glib_libs $gtk_libs'
diff --git a/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch b/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch
new file mode 100644
index 000000000000..a6cd71e75d50
--- /dev/null
+++ b/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch
@@ -0,0 +1,13 @@
+Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=501804
+Upstream: http://sourceforge.net/p/fbpanel/code/474/
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+
+--- a/exec/xlogout
++++ b/exec/xlogout
+@@ -45,5 +45,5 @@
+ [ -z "$SPID" ] && exit 1
+ echo "Session start up script"
+ ps -o uid,pid,ppid,sess,cmd --pid $SPID
+-kill -SIGTERM -$SPID
++kill -SIGTERM -$SPID $SPID