1 |
commit: dcbb4f602b9684c8c96f38d49c47bc278479ee04 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 9 07:44:27 2019 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 9 08:03:59 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcbb4f60 |
7 |
|
8 |
x11-misc/wbar: Clean up patches |
9 |
|
10 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
12 |
|
13 |
x11-misc/wbar/files/wbar-2.3.3-cfg.patch | 4 ---- |
14 |
x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch | 18 ------------------ |
15 |
x11-misc/wbar/files/wbar-2.3.3-nowerror.patch | 4 ---- |
16 |
x11-misc/wbar/files/wbar-2.3.3-test.patch | 4 ---- |
17 |
4 files changed, 30 deletions(-) |
18 |
|
19 |
diff --git a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch |
20 |
index 5ffd8286998..5d64909d28b 100644 |
21 |
--- a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch |
22 |
+++ b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch |
23 |
@@ -1,7 +1,3 @@ |
24 |
-From: Julian Ospald <hasufell@g.o> |
25 |
-Date: Fri Sep 21 21:45:22 UTC 2012 |
26 |
-Subject: remove wbar-config for -gtk |
27 |
- |
28 |
--- a/etc/wbar.cfg.in |
29 |
+++ b/etc/wbar.cfg.in |
30 |
@@ -2,8 +2,3 @@ |
31 |
|
32 |
diff --git a/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch |
33 |
index 79a5de15629..d2032dfa79f 100644 |
34 |
--- a/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch |
35 |
+++ b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch |
36 |
@@ -1,10 +1,3 @@ |
37 |
-From: Julian Ospald <hasufell@g.o> |
38 |
-Date: Fri Sep 21 17:08:32 2012 +0200 |
39 |
- |
40 |
- fix desktop file destination and QA issues |
41 |
- |
42 |
-diff --git a/configure.ac b/configure.ac |
43 |
-index 00ad0b6..48fe73d 100644 |
44 |
--- a/configure.ac |
45 |
+++ b/configure.ac |
46 |
@@ -83,6 +83,7 @@ AC_DEFINE_UNQUOTED(PIDOF_BIN, "$PIDOF_BIN ", [ program to retreive wbar pid ]) |
47 |
@@ -15,8 +8,6 @@ index 00ad0b6..48fe73d 100644 |
48 |
etc/Makefile \ |
49 |
etc/wbar.cfg \ |
50 |
etc/wbar.desktop.in \ |
51 |
-diff --git a/etc/Makefile.am b/etc/Makefile.am |
52 |
-index ec41c76..d78525e 100644 |
53 |
--- a/etc/Makefile.am |
54 |
+++ b/etc/Makefile.am |
55 |
@@ -3,7 +3,7 @@ CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop) |
56 |
@@ -28,8 +19,6 @@ index ec41c76..d78525e 100644 |
57 |
autostart_DATA = $(wbardesktop:.desktop.in.in=.desktop) |
58 |
|
59 |
bashcompletiondir = /etc/bash_completion.d |
60 |
-diff --git a/po/POTFILES.in b/po/POTFILES.in |
61 |
-index ddf920c..16ee6dd 100644 |
62 |
--- a/po/POTFILES.in |
63 |
+++ b/po/POTFILES.in |
64 |
@@ -1,3 +1,4 @@ |
65 |
@@ -37,16 +26,12 @@ index ddf920c..16ee6dd 100644 |
66 |
share/wbar.glade |
67 |
src/config/Functions.cc |
68 |
src/config/Functions.h |
69 |
-diff --git a/po/POTFILES.skip b/po/POTFILES.skip |
70 |
-index 327f139..27a8f48 100644 |
71 |
--- a/po/POTFILES.skip |
72 |
+++ b/po/POTFILES.skip |
73 |
@@ -1,2 +1,3 @@ |
74 |
etc/wbar.desktop.in.in |
75 |
+share/wbar.desktop.in.in |
76 |
|
77 |
-diff --git a/share/Makefile.am b/share/Makefile.am |
78 |
-index 87c736b..66027d4 100644 |
79 |
--- a/share/Makefile.am |
80 |
+++ b/share/Makefile.am |
81 |
@@ -1,8 +1,17 @@ |
82 |
@@ -69,9 +54,6 @@ index 87c736b..66027d4 100644 |
83 |
+$(wbardesktop) \ |
84 |
+$(wbardesktop:.desktop.in.in=.desktop.in) |
85 |
|
86 |
-diff --git a/share/wbar.desktop.in.in b/share/wbar.desktop.in.in |
87 |
-new file mode 100644 |
88 |
-index 0000000..48fc33c |
89 |
--- /dev/null |
90 |
+++ b/share/wbar.desktop.in.in |
91 |
@@ -0,0 +1,12 @@ |
92 |
|
93 |
diff --git a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch |
94 |
index 2cf163bc464..32c341b26e0 100644 |
95 |
--- a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch |
96 |
+++ b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch |
97 |
@@ -1,7 +1,3 @@ |
98 |
-From: Julian Ospald <hasufell@g.o> |
99 |
-Date: Sun Aug 26 17:18:37 UTC 2012 |
100 |
-Subject: remove Werror |
101 |
- |
102 |
--- a/src/Makefile.am |
103 |
+++ b/src/Makefile.am |
104 |
@@ -8,7 +8,6 @@ |
105 |
|
106 |
diff --git a/x11-misc/wbar/files/wbar-2.3.3-test.patch b/x11-misc/wbar/files/wbar-2.3.3-test.patch |
107 |
index 4468791a420..fc2cb7c5498 100644 |
108 |
--- a/x11-misc/wbar/files/wbar-2.3.3-test.patch |
109 |
+++ b/x11-misc/wbar/files/wbar-2.3.3-test.patch |
110 |
@@ -1,7 +1,3 @@ |
111 |
-From: Julian Ospald <hasufell@g.o> |
112 |
-Date: Fri Sep 21 21:50:34 UTC 2012 |
113 |
-Subject: fix test phase |
114 |
- |
115 |
--- a/po/POTFILES.in |
116 |
+++ b/po/POTFILES.in |
117 |
@@ -1,3 +1,4 @@ |