gentoo resync : 18.05.2019

6 files changed, 86 insertions, 30 deletions

diff --git a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
index 5ffd82869983..5d64909d28b2 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
@@ -1,7 +1,3 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Sep 21 21:45:22 UTC 2012
-Subject: remove wbar-config for -gtk
-
 --- a/etc/wbar.cfg.in
 +++ b/etc/wbar.cfg.in
 @@ -2,8 +2,3 @@
diff --git a/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch
index 79a5de15629d..d2032dfa79f6 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch
@@ -1,10 +1,3 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date:   Fri Sep 21 17:08:32 2012 +0200
-
-	fix desktop file destination and QA issues
-
-diff --git a/configure.ac b/configure.ac
-index 00ad0b6..48fe73d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -83,6 +83,7 @@ AC_DEFINE_UNQUOTED(PIDOF_BIN, "$PIDOF_BIN ", [ program to retreive wbar pid ])
@@ -15,8 +8,6 @@ index 00ad0b6..48fe73d 100644
  etc/Makefile \
  etc/wbar.cfg \
  etc/wbar.desktop.in \
-diff --git a/etc/Makefile.am b/etc/Makefile.am
-index ec41c76..d78525e 100644
 --- a/etc/Makefile.am
 +++ b/etc/Makefile.am
 @@ -3,7 +3,7 @@ CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop)
@@ -28,8 +19,6 @@ index ec41c76..d78525e 100644
  autostart_DATA = $(wbardesktop:.desktop.in.in=.desktop)
  
  bashcompletiondir = /etc/bash_completion.d
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index ddf920c..16ee6dd 100644
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
 @@ -1,3 +1,4 @@
@@ -37,16 +26,12 @@ index ddf920c..16ee6dd 100644
  share/wbar.glade
  src/config/Functions.cc
  src/config/Functions.h
-diff --git a/po/POTFILES.skip b/po/POTFILES.skip
-index 327f139..27a8f48 100644
 --- a/po/POTFILES.skip
 +++ b/po/POTFILES.skip
 @@ -1,2 +1,3 @@
  etc/wbar.desktop.in.in
 +share/wbar.desktop.in.in
  
-diff --git a/share/Makefile.am b/share/Makefile.am
-index 87c736b..66027d4 100644
 --- a/share/Makefile.am
 +++ b/share/Makefile.am
 @@ -1,8 +1,17 @@
@@ -69,9 +54,6 @@ index 87c736b..66027d4 100644
 +$(wbardesktop) \
 +$(wbardesktop:.desktop.in.in=.desktop.in)
  
-diff --git a/share/wbar.desktop.in.in b/share/wbar.desktop.in.in
-new file mode 100644
-index 0000000..48fc33c
 --- /dev/null
 +++ b/share/wbar.desktop.in.in
 @@ -0,0 +1,12 @@
diff --git a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
index 2cf163bc4642..32c341b26e0f 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
@@ -1,7 +1,3 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Aug 26 17:18:37 UTC 2012
-Subject: remove Werror
-
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -8,7 +8,6 @@
diff --git a/x11-misc/wbar/files/wbar-2.3.3-test.patch b/x11-misc/wbar/files/wbar-2.3.3-test.patch
index 4468791a4202..fc2cb7c5498c 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-test.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-test.patch
@@ -1,7 +1,3 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Sep 21 21:50:34 UTC 2012
-Subject: fix test phase
-
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
 @@ -1,3 +1,4 @@
diff --git a/x11-misc/wbar/files/wbar-2.3.4-c++11.patch b/x11-misc/wbar/files/wbar-2.3.4-c++11.patch
new file mode 100644
index 000000000000..fead9e9b4cb3
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.4-c++11.patch
@@ -0,0 +1,54 @@
+--- a/src/config/Functions.cc
++++ b/src/config/Functions.cc
+@@ -11,7 +11,7 @@
+ #include "Run.h"
+ #include "OptParser.h"
+ 
+-#define ICON_DEFAULT PIXMAPDIR"/"PACKAGE_NAME".png"
++#define ICON_DEFAULT PIXMAPDIR "/" PACKAGE_NAME ".png"
+ 
+ static const gchar *authors[] =
+ {
+@@ -304,7 +304,7 @@
+         
+         if (command.empty())
+         {
+-            command = PACKAGE_NAME" "DEFAULT_ARGV;
++            command = PACKAGE_NAME " " DEFAULT_ARGV;
+         }
+ 
+         if (argc <= 1 || tmpoptparser.isSet( OptParser::CONFIG ))
+--- a/src/config/Run.cc
++++ b/src/config/Run.cc
+@@ -125,9 +125,9 @@
+ 
+ bool Run::start(std::string command)
+ {
+-    if (system ((PACKAGE_NAME" " + command + " &").c_str()) != 0)
++    if (system ((PACKAGE_NAME " " + command + " &").c_str()) != 0)
+     {
+-        std::cout << _("Error run program: ") << PACKAGE_NAME" " + command << std::endl;
++        std::cout << _("Error run program: ") << PACKAGE_NAME " " + command << std::endl;
+     }
+     return Run::getPID() > 0;
+ }
+@@ -136,7 +136,7 @@
+ {
+     if (Run::getPID() > 0)
+     {
+-        if (system ("killall "PACKAGE_NAME) != 0)
++        if (system ("killall " PACKAGE_NAME) != 0)
+         {
+             std::cout << _("Error kill program: ") << PACKAGE_NAME << std::endl;
+         }
+--- a/src/core/Main.cc
++++ b/src/core/Main.cc
+@@ -81,7 +81,7 @@
+ 
+         if (command.empty())
+         {
+-            command = PACKAGE_NAME" "DEFAULT_ARGV;
++            command = PACKAGE_NAME " " DEFAULT_ARGV;
+         }
+ 
+         if (argc <= 1 || tmpoptparser.isSet( OptParser::CONFIG ))
diff --git a/x11-misc/wbar/files/wbar-2.3.4-gtk.patch b/x11-misc/wbar/files/wbar-2.3.4-gtk.patch
new file mode 100644
index 000000000000..76f2b902759f
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.4-gtk.patch
@@ -0,0 +1,32 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,7 +59,6 @@
+ AC_DEFINE_UNQUOTED(DEFAULT_ARGV, "$DEFAULT_ARGV" , [ The default argv ])
+ 
+ AC_PROG_INTLTOOL()
+-AM_GLIB_GNU_GETTEXT
+ PKG_PROG_PKG_CONFIG
+ 
+ PKG_CHECK_MODULES(modules, [imlib2 x11])
+--- a/etc/wbar.cfg.in
++++ b/etc/wbar.cfg.in
+@@ -2,8 +2,3 @@
+ c: @PACKAGE_NAME@ @DEFAULT_ARGV@
+ t: none
+ 
+-i: @PIXMAPDIR@/@PACKAGE_NAME@/wbar.png
+-c: wbar-config
+-t: Config
+-
+-
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -51,7 +51,7 @@
+ $(top_srcdir)/src/utils/i18n.h
+ 
+ wbar_CXXFLAGS = @modules_CFLAGS@
+-wbar_LDADD = @modules_LIBS@ @INTLLIBS@
++wbar_LDADD = @modules_LIBS@ 
+ 
+ if WBAR_CONFIG
+ wbar_config_CXXFLAGS = @gui_modules_CFLAGS@