Version bump. Fix underlinking wrt #367549. Thanks to Diego Elio Pettenò <flameeyes@gentoo.org> for the report. Drop old.

(Portage version: 2.2.0_alpha31/cvs/Linux x86_64)

4 files changed, 0 insertions, 150 deletions

diff --git a/x11-misc/wbar/files/wbar-2.1.1-as-needed.patch b/x11-misc/wbar/files/wbar-2.1.1-as-needed.patch
deleted file mode 100644
index 93fc68a4991c..000000000000
--- a/x11-misc/wbar/files/wbar-2.1.1-as-needed.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix automake issues with having two Main.cc
-Fix building with --as-needed
-
-https://bugs.gentoo.org/358557
-
-Patch provided by xarthisius@gentoo.org
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -22,7 +26,7 @@
- $(top_srcdir)/src/config/Run.cc \
- $(top_srcdir)/src/config/Functions.cc \
- $(top_srcdir)/src/config/Functions.h \
--$(top_srcdir)/src/config/Main.cc \
-+$(top_srcdir)/src/config/Main-config.cc \
- $(UTILS)
- 
- UTILS = \
-@@ -36,9 +40,11 @@
- $(top_srcdir)/src/utils/OptParser.h \
- $(top_srcdir)/src/utils/i18n.h
- 
--wbar_CPPFLAGS = @modules_CFLAGS@ -I$(top_srcdir)/src/utils
--wbar_LDFLAGS = @modules_LIBS@
-+AM_CPPFLAGS = -I$(top_srcdir)/src/utils
- 
--wbar_config_CPPFLAGS = @gui_modules_CFLAGS@ -I$(top_srcdir)/src/utils
--wbar_config_LDFLAGS = @gui_modules_LIBS@
-+wbar_CXXFLAGS = @modules_CFLAGS@
-+wbar_LDADD = @modules_LIBS@
-+
-+wbar_config_CXXFLAGS = @gui_modules_CFLAGS@
-+wbar_config_LDADD = @gui_modules_LIBS@
diff --git a/x11-misc/wbar/files/wbar-2.1.1-fix-warnings.patch b/x11-misc/wbar/files/wbar-2.1.1-fix-warnings.patch
deleted file mode 100644
index 096e44f923ff..000000000000
--- a/x11-misc/wbar/files/wbar-2.1.1-fix-warnings.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix unused result on fgets() in Run.cc and "format not a string
-literal" on gtk_message_dialog_new() in Functions.cc
-
-These are just warinings, but cause compile failures with -Wall -Werror
-
-Patch by Kevin McCarthy <signals@gentoo.org>
-
---- src/config/Run.cc
-+++ src/config/Run.cc
-@@ -33,7 +33,8 @@
-     if (process)
-     {
-         char spid[50];
--        fgets(spid, sizeof(spid), process);
-+        char* tmp;
-+        tmp=fgets(spid, sizeof(spid), process);
-         pclose(process);
- 
-         pid = atoi(spid);
---- src/config/Functions.cc
-+++ src/config/Functions.cc
-@@ -680,7 +680,7 @@
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_ERROR,
-                                   GTK_BUTTONS_OK,
--                                  (_("Error save config in ") + filename).c_str());
-+                                  "%s",(_("Error save config in ") + filename).c_str());
- 
-         gtk_dialog_run (GTK_DIALOG (dialog));
-         gtk_widget_destroy (dialog);
diff --git a/x11-misc/wbar/files/wbar-2.1.1-opt-config.patch b/x11-misc/wbar/files/wbar-2.1.1-opt-config.patch
deleted file mode 100644
index a33380b675cc..000000000000
--- a/x11-misc/wbar/files/wbar-2.1.1-opt-config.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Add --disable-wbar-config to support "gtk" USE flag.
-Setting it will disable building and installing the gtk-based
-config program.
-
-Patch by Kevin McCarthy <signals@gentoo.org>
-
---- configure.ac
-+++ configure.ac
-@@ -60,9 +60,15 @@
- AC_SUBST(modules_CFLAGS)
- AC_SUBST(modules_LIBS)
- 
--PKG_CHECK_MODULES(gui_modules, [gtk+-2.0 libglade-2.0])
--AC_SUBST(gui_modules_CFLAGS)
--AC_SUBST(gui_modules_LIBS)
-+AC_ARG_ENABLE(wbar-config, AS_HELP_STRING([--disable-wbar-config],
-+	[build without the GTK+ configuration interface]),[use_wbar_config=$enableval],
-+	[use_wbar_config=yes])
-+if test "$use_wbar_config" = "yes"; then
-+	PKG_CHECK_MODULES(gui_modules, [gtk+-2.0 libglade-2.0])
-+	AC_SUBST(gui_modules_CFLAGS)
-+	AC_SUBST(gui_modules_LIBS)
-+fi
-+AM_CONDITIONAL([WBAR],[test "$use_wbar_config" = "yes"])
- 
- CPPFLAGS="${CPPFLAGS} -Wall -Wunused -Werror -g -O2"
- 
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -1,6 +1,10 @@
- CLEANFILES = *~
- 
-+if WBAR
- bin_PROGRAMS = wbar wbar-config
-+else
-+bin_PROGRAMS = wbar
-+endif
- 
- wbar_SOURCES = \
- $(top_srcdir)/src/core/Bar.cc \
---- Makefile.am
-+++ Makefile.am
-@@ -1,4 +1,7 @@
- CLEANFILES = *~ po/*~
-+if WBAR
- SUBDIRS = src po pixmaps etc share
--
-+else
-+SUBDIRS = src po pixmaps etc
-+endif
- 
diff --git a/x11-misc/wbar/files/wbar-2.1.3-as-needed.patch b/x11-misc/wbar/files/wbar-2.1.3-as-needed.patch
deleted file mode 100644
index 3e917a670e0b..000000000000
--- a/x11-misc/wbar/files/wbar-2.1.3-as-needed.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix automake issues with having two Main.cc
-Fix building with --as-needed
-
-https://bugs.gentoo.org/358557
-
-Patch provided by xarthisius@gentoo.org for 2.1.1
-Patch adapted to 2.1.3 by Kevin McCarthy <signals@gentoo.org>
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -27,7 +27,7 @@
- $(top_srcdir)/src/config/Run.cc \
- $(top_srcdir)/src/config/Functions.cc \
- $(top_srcdir)/src/config/Functions.h \
--$(top_srcdir)/src/config/Main.cc \
-+$(top_srcdir)/src/config/Main-config.cc \
- $(UTILS)
- endif
- 
-@@ -42,11 +42,12 @@
- $(top_srcdir)/src/utils/OptParser.h \
- $(top_srcdir)/src/utils/i18n.h
- 
--wbar_CPPFLAGS = @modules_CFLAGS@ -I$(top_srcdir)/src/utils
--wbar_LDFLAGS = @modules_LIBS@
-+AM_CPPFLAGS = -I$(top_srcdir)/src/utils
-+wbar_CXXFLAGS = @modules_CFLAGS@
-+wbar_LDADD = @modules_LIBS@
- 
- if WBAR_CONFIG
--wbar_config_CPPFLAGS = @gui_modules_CFLAGS@ -I$(top_srcdir)/src/utils
--wbar_config_LDFLAGS = @gui_modules_LIBS@
-+wbar_config_CXXFLAGS = @gui_modules_CFLAGS@
-+wbar_config_LDADD = @gui_modules_LIBS@
- endif
-