Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=c02186779c0325057a1f1ed5ac13a76488b8dfa5

commit c02186779c0325057a1f1ed5ac13a76488b8dfa5
Author: James Buren <r...@frugalware.org>
Date:   Sat Mar 13 09:50:04 2010 -0600

windowlab-1.39-2-i686
* release bump
* backup the global menu configuration
* fix the installed pathing to use /usr and /etc properly
* disable an optional feature that causes crashes for now

diff --git a/source/x11-extra/windowlab/FrugalBuild 
b/source/x11-extra/windowlab/FrugalBuild
index 28f7172..f7645b5 100644
--- a/source/x11-extra/windowlab/FrugalBuild
+++ b/source/x11-extra/windowlab/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=windowlab
pkgver=1.39
-pkgrel=1
+pkgrel=2
pkgdesc="WindowLab is a small and simple window manager of novel design."
url="http://nickgravgaard.com/windowlab";
depends=('libxft>=2.1.13-2' 'zlib')
@@ -12,9 +12,10 @@ archs=('i686' 'x86_64')
up2date="Flasttar $url"
# i'll handle this
options=('nodocs')
-source=($url/$pkgname-$pkgver.tar $pkgname-1.34-makefile.patch)
+backup=("etc/X11/$pkgname/$pkgname.menurc")
+source=($url/$pkgname-$pkgver.tar $pkgname-1.39-makefile.patch)
sha1sums=('22010d3aa63ce27c7155f6b9d6ab4e35dbc22368' \
-          '935b7f00e460eb87949f406e488f8715a1724bff')
+          '280cf546f49e21397e4885a4cf49659471a003b9')

build()
{
diff --git a/source/x11-extra/windowlab/windowlab-1.34-makefile.patch 
b/source/x11-extra/windowlab/windowlab-1.34-makefile.patch
deleted file mode 100644
index aefa358..0000000
--- a/source/x11-extra/windowlab/windowlab-1.34-makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur windowlab-1.34/Makefile windowlab-1.34-2/Makefile
---- windowlab-1.34/Makefile    2006-08-13 12:27:52.000000000 -0500
-+++ windowlab-1.34-2/Makefile  2008-06-25 22:52:58.000000000 -0500
-@@ -8,7 +8,7 @@
- PREFIX =
-
- # Set this to the location of the X installation you want to compile against
--XROOT = /usr/X11R6
-+XROOT = /usr
-
- # Set this to the location of the global configuration files
- SYSCONFDIR = $(PREFIX)/etc/X11/windowlab
-@@ -21,13 +21,13 @@
- DEFINES += -DDEF_MENURC="\"$(MENURC)\""
-
- # Uncomment to add MWM hints support
--#DEFINES += -DMWM_HINTS
-+DEFINES += -DMWM_HINTS
-
- # Uncomment to add freetype support (requires XFree86 4.0.2 or later)
- # This needs -lXext above, even if you have disabled shape support
--#DEFINES += -DXFT
--#EXTRA_INC += `pkg-config --cflags xft`
--#EXTRA_LIBS += `pkg-config --libs xft`
-+DEFINES += -DXFT
-+EXTRA_INC += `pkg-config --cflags xft`
-+EXTRA_LIBS += `pkg-config --libs xft`
-
- # Uncomment for debugging info (abandon all hope, ye who enter here)
- #DEFINES += -DDEBUG
diff --git a/source/x11-extra/windowlab/windowlab-1.39-makefile.patch 
b/source/x11-extra/windowlab/windowlab-1.39-makefile.patch
new file mode 100644
index 0000000..95ae184
--- /dev/null
+++ b/source/x11-extra/windowlab/windowlab-1.39-makefile.patch
@@ -0,0 +1,34 @@
+diff -aur windowlab-1.39/Makefile windowlab-1.39-2/Makefile
+--- windowlab-1.39/Makefile    2009-11-05 15:04:45.000000000 -0600
++++ windowlab-1.39-2/Makefile  2010-03-13 06:59:25.000000000 -0600
+@@ -5,7 +5,7 @@
+ EXTRA_LIBS += -lXext
+
+ # Set this to the hardcoded location of all files if it's not /
+-PREFIX = /usr/local
++PREFIX = /usr
+
+ # Set this to the directory, below PREFIX, where man pages
+ # are expected. Below this directory, the target "install"
+@@ -20,7 +20,7 @@
+ CONFDIR = /etc/X11/windowlab
+
+ # Set this to the location of the global configuration files
+-SYSCONFDIR = $(CONFPREFIX)$(CONFDIR)
++SYSCONFDIR = /etc/X11/windowlab
+
+ # Information about the location of the menurc file
+ ifndef MENURC
+@@ -34,9 +34,9 @@
+
+ # Uncomment to add freetype support (requires XFree86 4.0.2 or later)
+ # This needs -lXext above, even if you have disabled shape support
+-#DEFINES += -DXFT
+-#EXTRA_INC += `pkg-config --cflags xft`
+-#EXTRA_LIBS += `pkg-config --libs xft`
++DEFINES += -DXFT
++EXTRA_INC += `pkg-config --cflags xft`
++EXTRA_LIBS += `pkg-config --libs xft`
+
+ # Uncomment for debugging info (abandon all hope, ye who enter here)
+ #DEFINES += -DDEBUG
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to