x11-misc/wbar: Clean up patches

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

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 5ffd82869983244f498617f40188ac0fb640fac8..5d64909d28b28828816a44f73da244554c571b78 100644 (file)
--- 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 79a5de15629d9773465002e89668a3282d3b165b..d2032dfa79f6b6ada48551a647efca03bf668be7 100644 (file)
--- 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 2cf163bc464264109e722b00a07bc735f42fc065..32c341b26e0f409b4b48670dc0a71e26f131ea6b 100644 (file)
--- 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 4468791a420223fb0ead884180c52bb5eaa172fa..fc2cb7c5498cbcb8439ebe78431fa25a87f07581 100644 (file)
--- 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 @@