| 1 |
hasufell 12/08/26 17:34:30 |
| 2 |
|
| 3 |
Added: wbar-2.3.1-nowerror.patch |
| 4 |
wbar-2.3.1-desktopfile.patch |
| 5 |
Log: |
| 6 |
version bump |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha122/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 x11-misc/wbar/files/wbar-2.3.1-nowerror.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/wbar/files/wbar-2.3.1-nowerror.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/wbar/files/wbar-2.3.1-nowerror.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: wbar-2.3.1-nowerror.patch |
| 17 |
=================================================================== |
| 18 |
From: Julian Ospald <hasufell@g.o> |
| 19 |
Date: Sun Aug 26 17:18:37 UTC 2012 |
| 20 |
Subject: remove Werror |
| 21 |
|
| 22 |
--- src/Makefile.am |
| 23 |
+++ src/Makefile.am |
| 24 |
@@ -8,7 +8,6 @@ |
| 25 |
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \ |
| 26 |
-Wall \ |
| 27 |
-Wunused \ |
| 28 |
- -Werror \ |
| 29 |
-I$(top_srcdir)/src/utils |
| 30 |
|
| 31 |
if WBAR_CONFIG |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.1 x11-misc/wbar/files/wbar-2.3.1-desktopfile.patch |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/wbar/files/wbar-2.3.1-desktopfile.patch?rev=1.1&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/wbar/files/wbar-2.3.1-desktopfile.patch?rev=1.1&content-type=text/plain |
| 39 |
|
| 40 |
Index: wbar-2.3.1-desktopfile.patch |
| 41 |
=================================================================== |
| 42 |
From: Julian Ospald <hasufell@g.o> |
| 43 |
Date: Sun Aug 26 16:34:39 UTC 2012 |
| 44 |
Subject: fix desktop file destination and QA issues |
| 45 |
|
| 46 |
diff --git a/configure.ac b/configure.ac |
| 47 |
index 0fc821c..2db7c02 100644 |
| 48 |
--- a/configure.ac |
| 49 |
+++ b/configure.ac |
| 50 |
@@ -83,6 +83,7 @@ AC_DEFINE_UNQUOTED(PIDOF_BIN, "$PIDOF_BIN ", [ program to retreive wbar pid ]) |
| 51 |
|
| 52 |
AC_CONFIG_FILES([Makefile \ |
| 53 |
share/Makefile \ |
| 54 |
+share/wbar.desktop.in \ |
| 55 |
etc/Makefile \ |
| 56 |
etc/wbar.cfg \ |
| 57 |
etc/wbar.desktop.in \ |
| 58 |
diff --git a/etc/Makefile.am b/etc/Makefile.am |
| 59 |
index 1bcb238..a433e0c 100644 |
| 60 |
--- a/etc/Makefile.am |
| 61 |
+++ b/etc/Makefile.am |
| 62 |
@@ -3,7 +3,7 @@ CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop) |
| 63 |
defaultdir = @DEFAULT_CONFIGDIR@ |
| 64 |
default_DATA = $(wbarcfg:.cfg.in=.cfg) |
| 65 |
|
| 66 |
-autostartdir = @DEFAULT_CONFIGDIR@ |
| 67 |
+autostartdir = $(sysconfdir)/xdg/autostart |
| 68 |
autostart_DATA = $(wbardesktop:.desktop.in.in=.desktop) |
| 69 |
|
| 70 |
@INTLTOOL_DESKTOP_RULE@ |
| 71 |
diff --git a/po/POTFILES.in b/po/POTFILES.in |
| 72 |
index 8472c3c..8ed7725 100644 |
| 73 |
--- a/po/POTFILES.in |
| 74 |
+++ b/po/POTFILES.in |
| 75 |
@@ -1,4 +1,5 @@ |
| 76 |
etc/wbar.desktop.in |
| 77 |
+share/wbar.desktop.in |
| 78 |
share/wbar.glade |
| 79 |
src/config/Functions.cc |
| 80 |
src/config/Functions.h |
| 81 |
diff --git a/po/POTFILES.skip b/po/POTFILES.skip |
| 82 |
index 327f139..a9fbd01 100644 |
| 83 |
--- a/po/POTFILES.skip |
| 84 |
+++ b/po/POTFILES.skip |
| 85 |
@@ -1,2 +1,2 @@ |
| 86 |
etc/wbar.desktop.in.in |
| 87 |
- |
| 88 |
+share/wbar.desktop.in.in |
| 89 |
diff --git a/share/Makefile.am b/share/Makefile.am |
| 90 |
index 87c736b..091935c 100644 |
| 91 |
--- a/share/Makefile.am |
| 92 |
+++ b/share/Makefile.am |
| 93 |
@@ -1,8 +1,16 @@ |
| 94 |
-CLEANFILES = *~ |
| 95 |
+CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop) |
| 96 |
|
| 97 |
gladedir = @GLADE_PACKAGE_DIR@ |
| 98 |
glade_DATA = @PACKAGE@.glade |
| 99 |
|
| 100 |
-EXTRA_DIST = \ |
| 101 |
-$(glade_DATA) |
| 102 |
+desktopfilesdir = $(prefix)/share/applications |
| 103 |
+desktopfiles_DATA = $(wbardesktop:.desktop.in.in=.desktop) |
| 104 |
+ |
| 105 |
+@INTLTOOL_DESKTOP_RULE@ |
| 106 |
|
| 107 |
+wbardesktop = wbar.desktop.in.in |
| 108 |
+ |
| 109 |
+EXTRA_DIST = \ |
| 110 |
+$(glade_DATA) \ |
| 111 |
+$(wbardesktop) \ |
| 112 |
+$(wbardesktop:.desktop.in.in=.desktop.in) |
| 113 |
diff --git a/share/wbar.desktop.in.in b/share/wbar.desktop.in.in |
| 114 |
new file mode 100644 |
| 115 |
index 0000000..48fc33c |
| 116 |
--- /dev/null |
| 117 |
+++ b/share/wbar.desktop.in.in |
| 118 |
@@ -0,0 +1,12 @@ |
| 119 |
+[Desktop Entry] |
| 120 |
+_Name=Warlock Bar |
| 121 |
+Type=Application |
| 122 |
+Exec=@BINDIR@/@PACKAGE_NAME@ |
| 123 |
+Terminal=false |
| 124 |
+Icon=@PIXMAPDIR@/@PACKAGE_NAME@.png |
| 125 |
+_Comment=A light and fast launch bar. |
| 126 |
+Categories=Utility; |
| 127 |
+X-GNOME-Bugzilla-Bugzilla=GNOME |
| 128 |
+X-GNOME-Bugzilla-Product=@PACKAGE_NAME@ |
| 129 |
+X-GNOME-Bugzilla-Component=general |
| 130 |
+X-Ubuntu-Gettext-Domain=@PACKAGE_NAME@ |
Archives