diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2019-05-09 09:48:35 +0200 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2019-05-09 10:03:59 +0200 |
| commit | 6d78e77332db5e494cb3d82e7f4666d92250d3f6 (patch) | |
| tree | 11629ee2b114a42f7244c369f8138de117388eaf /x11-misc/wbar/files | |
| parent | x11-misc/wbar: Clean up patches (diff) | |
| download | gentoo-6d78e77332db5e494cb3d82e7f4666d92250d3f6.tar.gz gentoo-6d78e77332db5e494cb3d82e7f4666d92250d3f6.tar.bz2 gentoo-6d78e77332db5e494cb3d82e7f4666d92250d3f6.zip | |
x11-misc/wbar: Fix automagic dev-libs/glib dependency
* Fix a bunch of C++11 warnings
* USE=-gtk should patch out AM_GLIB_GNU_GETTEXT and @INTLLIBS@
* USE=gtk should depend on dev-libs/glib
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Fixes: https://bugs.gentoo.org/685068
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'x11-misc/wbar/files')
| -rw-r--r-- | x11-misc/wbar/files/wbar-2.3.4-c++11.patch | 54 | ||||
| -rw-r--r-- | x11-misc/wbar/files/wbar-2.3.4-gtk.patch | 32 |
2 files changed, 86 insertions, 0 deletions
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@ |