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

commit f2c2e9a1a98ca50759cf6bfbb3ec28bef10b40b5
Author: Elentir <elen...@frugalware.org>
Date:   Sun Sep 19 23:24:43 2010 +0200

slim-1.3.2-1-i686

* version bump

diff --git a/source/xfce4/slim/Fix_GCC43.diff b/source/xfce4/slim/Fix_GCC43.diff
deleted file mode 100644
index 24df3b1..0000000
--- a/source/xfce4/slim/Fix_GCC43.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- cfg.cpp.orig       2008-04-21 00:36:08.000000000 -0700
-+++ cfg.cpp    2008-04-21 00:37:01.000000000 -0700
-@@ -11,6 +11,7 @@
- #include <fstream>
- #include <string>
- #include <iostream>
-+#include <cstdlib>
- #include <unistd.h>
-
- #include <sys/types.h>
---- switchuser.h~      2008-11-11 19:40:18.000000000 +0000
-+++ switchuser.h       2008-11-11 19:40:28.000000000 +0000
-@@ -18,6 +18,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <paths.h>
-+#include <cstdio>
- #include <iostream>
- #include "const.h"
- #include "cfg.h"
-
diff --git a/source/xfce4/slim/FrugalBuild b/source/xfce4/slim/FrugalBuild
index 9c3794f..a20f5e2 100644
--- a/source/xfce4/slim/FrugalBuild
+++ b/source/xfce4/slim/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Priyank Gosalia <priyan...@gmail.com>

pkgname=slim
-pkgver=1.3.1
-pkgrel=9
+pkgver=1.3.2
+pkgrel=1
pkgdesc="SLiM is a lightweight, Desktop-independent graphical login manager for 
X11."
depends=('libpng' 'libjpeg')
makedepends=('libx11>=1.2.2-1' 'libxft' 'libxmu')
@@ -12,20 +12,18 @@ groups=('xfce4')
archs=('i686' 'x86_64' 'ppc')
backup=('etc/slim.conf')
Finclude berlios
-up2date=("lynx -dump 
http://developer.berlios.de/project/showfiles.php?group_id=2663 |grep 
slim-[0-9].[0-9].[0-9].tar |sed -ne 's/.*-\(.*\).t.*/\1/;1p'")
+up2date="Flasttar http://slim.berlios.de/";
source=(${sour...@]} \
slim.conf \
slim.install \
-       $pkgname-$pkgver-cflags.diff \
-       
http://ftp.frugalware.org/pub/other/artwork/slim-theme/frugalware-1.3.tar.bz2 \
-       Fix_GCC43.diff)
+       slim-1.3.2-cflags.patch \
+       
http://ftp.frugalware.org/pub/other/artwork/slim-theme/frugalware-1.3.tar.bz2)

-sha1sums=('30152b280724daf75299a8ee16585041f253ed4f' \
+sha1sums=('e421d5487732c8317f8f591906661e014b036358' \
'98dcec8ae2d52ae9c9b5abcfa3d145882a0848bd' \
'a17849f628f4f74cf1bd48eea21a144f2f1a274d' \
-          'cb591f6696e63ef43c8c86007283b0e59f4f2895' \
-          '065f8157cb9e09c32eff4908005e7f208b6a10e2' \
-          'b9e0e8d6643bab8a5361cce6bd8fdcc5a710eab2')
+          '55bba5f18fde0f93114c6e8428c48706c05dd0ff' \
+          '065f8157cb9e09c32eff4908005e7f208b6a10e2')

build()
{
diff --git a/source/xfce4/slim/slim-1.3.1-cflags.diff 
b/source/xfce4/slim/slim-1.3.2-cflags.patch
similarity index 68%
rename from source/xfce4/slim/slim-1.3.1-cflags.diff
rename to source/xfce4/slim/slim-1.3.2-cflags.patch
index 6c92a35..ae0833b 100644
--- a/source/xfce4/slim/slim-1.3.1-cflags.diff
+++ b/source/xfce4/slim/slim-1.3.2-cflags.patch
@@ -1,6 +1,6 @@
-diff -Naur slim-1.3.1/Makefile slim-1.3.1.new/Makefile
---- slim-1.3.1/Makefile        2008-09-26 06:24:15.000000000 +0530
-+++ slim-1.3.1.new/Makefile    2008-10-03 00:24:09.000000000 +0530
+diff -Naur slim-1.3.2/Makefile slim-1.3.2/Makefile
+--- slim-1.3.2/Makefile        2010-07-08 07:04:10.000000000 +0200
++++ slim-1.3.2/Makefile        2010-09-06 23:54:52.001000000 +0200
@@ -5,9 +5,9 @@
#######################################################
CXX=/usr/bin/g++
@@ -8,8 +8,8 @@ diff -Naur slim-1.3.1/Makefile slim-1.3.1.new/Makefile
-CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config 
-I/usr/include/libpng12 -I/usr/include
+CFLAGS+=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config 
-I/usr/include/libpng14 -I/usr/include
CXXFLAGS=$(CFLAGS)
--LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt 
-lXmu -lpng -ljpeg
-+LDFLAGS+=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng14 -lz -lm 
-lcrypt -lXmu -lpng -ljpeg
+-LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt 
-lXmu -lpng -ljpeg -lrt
++LDFLAGS+=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng14 -lz -lm 
-lcrypt -lXmu -lpng -ljpeg -lrt
CUSTOM=-DHAVE_SHADOW
ifdef USE_PAM
LDFLAGS+= -lpam
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to