summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-08-26 19:07:52 +0000
committerJeroen Roovers <jer@gentoo.org>2013-08-26 19:07:52 +0000
commitc905b9b6481960e357644cf75b4796162f5bf9f2 (patch)
tree35c11160fb79e1f9e4d2838299e1ab463841403e /x11-misc/fbpanel/files
parentnet-misc/dropbox: Version BUmp (diff)
downloadgentoo-2-c905b9b6481960e357644cf75b4796162f5bf9f2.tar.gz
gentoo-2-c905b9b6481960e357644cf75b4796162f5bf9f2.tar.bz2
gentoo-2-c905b9b6481960e357644cf75b4796162f5bf9f2.zip
Respect CC. Fix underlinking. Install plugins into proper multilib-strict dir. Warn about missing /dev/mixer.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-misc/fbpanel/files')
-rw-r--r--x11-misc/fbpanel/files/fbpanel-6.0-configure-LANG.patch21
-rw-r--r--x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch15
2 files changed, 15 insertions, 21 deletions
diff --git a/x11-misc/fbpanel/files/fbpanel-6.0-configure-LANG.patch b/x11-misc/fbpanel/files/fbpanel-6.0-configure-LANG.patch
deleted file mode 100644
index 21148d498eb7..000000000000
--- a/x11-misc/fbpanel/files/fbpanel-6.0-configure-LANG.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig 2010-03-25 20:36:48.000000000 +0200
-+++ configure 2010-03-25 20:37:46.000000000 +0200
-@@ -1,6 +1,17 @@
- #!/bin/bash
-
--export LANG="POSIX"
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ unset $as_var
-+ fi
-+done
-
- CMD="$@"
-
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'