summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-misc/wbar/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-misc/wbar/files')
-rw-r--r--x11-misc/wbar/files/wbar-2.3.3-cfg.patch15
-rw-r--r--x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch89
-rw-r--r--x11-misc/wbar/files/wbar-2.3.3-nowerror.patch14
-rw-r--r--x11-misc/wbar/files/wbar-2.3.3-test.patch11
-rw-r--r--x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch11
-rw-r--r--x11-misc/wbar/files/wbar-2.3.4-completion.patch19
6 files changed, 159 insertions, 0 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
new file mode 100644
index 00000000000..5ffd8286998
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
@@ -0,0 +1,15 @@
+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 @@
+ c: @PACKAGE_NAME@ @DEFAULT_ARGV@
+ t: none
+
+-i: @PIXMAPDIR@/@PACKAGE_NAME@/wbar.png
+-c: wbar-config
+-t: Config
+-
+-
diff --git a/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch
new file mode 100644
index 00000000000..79a5de15629
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch
@@ -0,0 +1,89 @@
+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 ])
+
+ AC_CONFIG_FILES([Makefile \
+ share/Makefile \
++share/wbar.desktop.in \
+ 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)
+ defaultdir = @DEFAULT_CONFIGDIR@
+ default_DATA = $(wbarcfg:.cfg.in=.cfg)
+
+-autostartdir = @DEFAULT_CONFIGDIR@
++autostartdir = $(sysconfdir)/xdg/autostart
+ 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 @@
++share/wbar.desktop.in
+ 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 @@
+-CLEANFILES = *~
++CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop)
+
+ gladedir = @GLADE_PACKAGE_DIR@
+ glade_DATA = @PACKAGE@.glade
+
++desktopfilesdir = $(prefix)/share/applications
++desktopfiles_DATA = $(wbardesktop:.desktop.in.in=.desktop)
++
++@INTLTOOL_DESKTOP_RULE@
++
++wbardesktop = wbar.desktop.in.in
++
+ EXTRA_DIST = \
+-$(glade_DATA)
++$(glade_DATA) \
++$(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 @@
++[Desktop Entry]
++_Name=Warlock Bar
++Type=Application
++Exec=@BINDIR@/@PACKAGE_NAME@
++Terminal=false
++Icon=@PIXMAPDIR@/@PACKAGE_NAME@.png
++_Comment=A light and fast launch bar.
++Categories=Utility;
++X-GNOME-Bugzilla-Bugzilla=GNOME
++X-GNOME-Bugzilla-Product=@PACKAGE_NAME@
++X-GNOME-Bugzilla-Component=general
++X-Ubuntu-Gettext-Domain=@PACKAGE_NAME@
diff --git a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
new file mode 100644
index 00000000000..2cf163bc464
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
@@ -0,0 +1,14 @@
+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 @@
+ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ -Wall \
+ -Wunused \
+- -Werror \
+ -I$(top_srcdir)/src/utils
+
+ if WBAR_CONFIG
diff --git a/x11-misc/wbar/files/wbar-2.3.3-test.patch b/x11-misc/wbar/files/wbar-2.3.3-test.patch
new file mode 100644
index 00000000000..4468791a420
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.3-test.patch
@@ -0,0 +1,11 @@
+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 @@
++etc/wbar.desktop.in
+ share/wbar.desktop.in
+ share/wbar.glade
+ src/config/Functions.cc
diff --git a/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch b/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch
new file mode 100644
index 00000000000..d8f59518ca1
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ AC_INIT([wbar], [2.3.4])
+ AM_INIT_AUTOMAKE([ filename-length-max=256 tar-ustar ])
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+
+ AC_PROG_CXX
diff --git a/x11-misc/wbar/files/wbar-2.3.4-completion.patch b/x11-misc/wbar/files/wbar-2.3.4-completion.patch
new file mode 100644
index 00000000000..218d33442a9
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.4-completion.patch
@@ -0,0 +1,19 @@
+--- a/etc/wbar
++++ b/etc/wbar
+@@ -1,7 +1,6 @@
+ # bash completion for wbar
+ # Yadickson Soto yadickson@gmail.com
+
+-have wbar &&
+ _wbar()
+ {
+ local cur prev split=false
+@@ -106,7 +105,7 @@
+ -- "$cur") )
+
+ fi
+-} &&
++}
+ complete -F _wbar wbar
+
+ # Local variables: