[arch-commits] Commit in gpm/trunk (6 files)
Eric Belanger
eric at archlinux.org
Tue Apr 22 01:27:20 UTC 2008
Date: Monday, April 21, 2008 @ 21:27:20
Author: eric
Revision: 707
upgpkg: gpm 1.20.3-1
Upstream update, Added missing /usr/lib/libgpm.so.1 symlink (close FS#9949)
Added:
gpm/trunk/ChangeLog
Modified:
gpm/trunk/PKGBUILD
Deleted:
gpm/trunk/gpm-1.20.1-nodebug.patch
gpm/trunk/gpm-openmax.patch
gpm/trunk/gpm-quietdeath.patch
gpm/trunk/gpm.patch
--------------------------+
ChangeLog | 5 ++++
PKGBUILD | 43 +++++++++++++++-------------------
gpm-1.20.1-nodebug.patch | 56 ---------------------------------------------
gpm-openmax.patch | 39 -------------------------------
gpm-quietdeath.patch | 24 -------------------
gpm.patch | 29 -----------------------
6 files changed, 24 insertions(+), 172 deletions(-)
Added: ChangeLog
===================================================================
--- ChangeLog (rev 0)
+++ ChangeLog 2008-04-22 01:27:20 UTC (rev 707)
@@ -0,0 +1,5 @@
+2008-04-17 Eric Belanger <eric at archlinux.org>
+
+ * gpm 1.20.3-1
+ * Upstream update
+ * Added missing /usr/lib/libgpm.so.1 symlink (close FS#9949)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-04-22 00:29:02 UTC (rev 706)
+++ PKGBUILD 2008-04-22 01:27:20 UTC (rev 707)
@@ -1,11 +1,10 @@
# $Id$
# Maintainer: Eric Belanger <eric at archlinux.org>
-# Committer: Judd Vinet <jvinet at zeroflux.org>
# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
pkgname=gpm
-pkgver=1.20.1
-pkgrel=7
+pkgver=1.20.3
+pkgrel=1
pkgdesc="A mouse server for the console and xterm"
arch=('i686' 'x86_64')
url="http://unix.schottelius.org/gpm/"
@@ -13,31 +12,27 @@
depends=('ncurses')
backup=(etc/conf.d/gpm)
options=('!makeflags')
-source=(http://unix.schottelius.org/gpm/archives/$pkgname-$pkgver.tar.bz2 \
- gpm.patch gpm-quietdeath.patch gpm-openmax.patch \
- gpm-1.20.1-nodebug.patch gpm gpm.conf.d)
-md5sums=('2c63e827d755527950d9d13fe3d87692' 'ffcb5ead568a7ce39602e2d39555b251'\
- '583fa2cf2a9db7ca458b23c1d095f667' '6b7be08b0f4e62f1871fa5b3aec25dbd'\
- '285019976ad18695a2d47bcce23cb18c' 'c4d42a4725503a5524cae060a959a3d3'\
+source=(http://unix.schottelius.org/gpm/archives/${pkgname}-${pkgver}.tar.bz2 \
+ gpm gpm.conf.d)
+md5sums=('dd6054c488fc36fec327acc5b1f3e7d6' 'c4d42a4725503a5524cae060a959a3d3'\
'5f109341a7d1bb18c59d7c3a395d848a')
-sha1sums=('c48d937e62abb438c2f6439b34ef3332c89af8d1'
- '16541df8144073b4e79664fd0070ec7233547e72'
- '411f06da13e881dd07d6ea8765decc0eb7acc195'
- '2d47d63b285153bfaa016aa20c342519a4bdb5a1'
- '1491349903987f6b2c4ca0a61dbeeb6ce6335e44'
+sha1sums=('352e1b40702ef5e8c088d61d70dd62fb24a6732e'
'c13ad1422d24af320e2abb9786c7eacef39b293c'
'3bcb67027f0ad7dc393388fb02c261126671f9f5')
build() {
- cd $startdir/src/$pkgname-$pkgver
- patch -Np1 -i ../gpm-quietdeath.patch || return 1
- patch -Np1 -i ../gpm.patch || return 1
- patch -Np1 -i ../gpm-openmax.patch || return 1
- patch -Np1 -i ../gpm-1.20.1-nodebug.patch || return 1
+ cd ${startdir}/src/${pkgname}-${pkgver}
+# cleaning source directory
+ rm src/prog/open_console.o
+
./configure --prefix=/usr --sysconfdir=/etc
- make LIBS=-lm || return 1
- make prefix=$startdir/pkg/usr install
- install -D -m755 ../gpm $startdir/pkg/etc/rc.d/gpm
- install -D -m644 ../gpm.conf.d $startdir/pkg/etc/conf.d/gpm
- chmod 755 $startdir/pkg/usr/lib/libgpm.so.*
+ make || return 1
+ make DESTDIR=${startdir}/pkg install
+ install -D -m755 ../gpm ${startdir}/pkg/etc/rc.d/gpm
+ install -D -m644 ../gpm.conf.d ${startdir}/pkg/etc/conf.d/gpm
+
+# library fixes
+ cd ${startdir}/pkg/usr/lib/
+ ln -s libgpm.so.* libgpm.so.1
+ chmod 755 ${startdir}/pkg/usr/lib/libgpm.so.*
}
Deleted: gpm-1.20.1-nodebug.patch
===================================================================
--- gpm-1.20.1-nodebug.patch 2008-04-22 00:29:02 UTC (rev 706)
+++ gpm-1.20.1-nodebug.patch 2008-04-22 01:27:20 UTC (rev 707)
@@ -1,56 +0,0 @@
---- gpm-1.20.1/src/report.c.nodebug 2002-12-24 17:57:16.000000000 -0500
-+++ gpm-1.20.1/src/report.c 2003-07-02 15:07:19.000000000 -0400
-@@ -126,6 +126,7 @@
- /******************** RUNNING *****************/
- case GPM_RUN_DAEMON:
- switch(stat) {
-+#if 0
- case GPM_STAT_INFO:
- #ifdef HAVE_VSYSLOG
- syslog(LOG_INFO | LOG_USER, GPM_STRING_INFO);
-@@ -165,6 +166,7 @@
- fclose(console);
- }
- break;
-+#endif
-
- case GPM_STAT_OOPS:
- #ifdef HAVE_VSYSLOG
-@@ -183,6 +185,7 @@
- /******************** DEBUGGING and CLIENT *****************/
- case GPM_RUN_DEBUG:
- switch(stat) {
-+#if 0
- case GPM_STAT_INFO:
- console = stdout;
- fprintf(console,GPM_STRING_INFO); break;
-@@ -195,13 +198,15 @@
- case GPM_STAT_DEBUG:
- console = stderr;
- fprintf(console,GPM_STRING_DEBUG); break;
-+#endif
- case GPM_STAT_OOPS:
- console = stderr;
- fprintf(console,GPM_STRING_OOPS); break;
-+ vfprintf(console,text,ap);
-+ fprintf(console,"\n");
-+ break;
- }
-
-- vfprintf(console,text,ap);
-- fprintf(console,"\n");
-
- if(stat == GPM_STAT_OOPS) exit(1);
-
---- gpm-1.20.1/src/lib/liblow.c.orig 2003-07-02 15:24:40.000000000 -0400
-+++ gpm-1.20.1/src/lib/liblow.c 2003-07-02 15:24:44.000000000 -0400
-@@ -201,7 +201,9 @@
-
- option.consolename = NULL;
-
-+#if 0
- gpm_report(GPM_PR_DEBUG,"VC: %d",flag);
-+#endif
-
- /*....................................... First of all, check xterm */
-
Deleted: gpm-openmax.patch
===================================================================
--- gpm-openmax.patch 2008-04-22 00:29:02 UTC (rev 706)
+++ gpm-openmax.patch 2008-04-22 01:27:20 UTC (rev 707)
@@ -1,39 +0,0 @@
-The OPEN_MAX constant was removed in Linux 2.6.23
-(commit 77293034696e3e0b6c8b8fc1f96be091104b3d2b)
-and sysconf is the POSIX way to do it.
-
-Signed-off-by: Tomas Janousek <tjanouse at redhat.com>
----
- src/prog/gpm-root.y | 4 +++-
- src/special.c | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
-index 3a97602..b496550 100644
---- a/src/prog/gpm-root.y
-+++ b/src/prog/gpm-root.y
-@@ -526,7 +526,9 @@ int f_bgcmd(int mode, DrawItem *self, int uid)
- open("/dev/null",O_RDONLY); /* stdin */
- open(consolename,O_WRONLY); /* stdout */
- dup(1); /* stderr */
-- for (i=3;i<OPEN_MAX; i++) close(i);
-+ int open_max = sysconf(_SC_OPEN_MAX);
-+ if (open_max == -1) open_max = 1024;
-+ for (i=3;i<open_max; i++) close(i);
- execl("/bin/sh","sh","-c",self->arg,(char *)NULL);
- exit(1); /* shouldn't happen */
- default: return 0;
-diff --git a/src/special.c b/src/special.c
-index 5bed91a..c6cd04d 100644
---- a/src/special.c
-+++ b/src/special.c
-@@ -156,6 +156,8 @@ int processSpecial(Gpm_Event *event)
- open(GPM_NULL_DEV,O_RDONLY); /* stdin */
- open(console.device, O_WRONLY); /* stdout */
- dup(1); /* stderr */
-- for (i=3;i<OPEN_MAX; i++) close(i);
-+ int open_max = sysconf(_SC_OPEN_MAX);
-+ if (open_max == -1) open_max = 1024;
-+ for (i=3;i<open_max; i++) close(i);
- execl("/bin/sh","sh","-c",command,(char *)NULL);
- exit(1); /* shouldn't happen */
Deleted: gpm-quietdeath.patch
===================================================================
--- gpm-quietdeath.patch 2008-04-22 00:29:02 UTC (rev 706)
+++ gpm-quietdeath.patch 2008-04-22 01:27:20 UTC (rev 707)
@@ -1,24 +0,0 @@
-diff -Naur gpm-1.20.1-orig/src/lib/liblow.c gpm-1.20.1/src/lib/liblow.c
---- gpm-1.20.1-orig/src/lib/liblow.c 2002-12-24 14:57:16.000000000 -0800
-+++ gpm-1.20.1/src/lib/liblow.c 2005-12-05 00:14:05.000000000 -0800
-@@ -198,6 +198,11 @@
- struct winsize win;
- Gpm_Stst *new = NULL;
- char* sock_name = 0;
-+ /* don't bother continuing if the control socket isn't there */
-+ struct stat sbuf;
-+ if(stat(GPM_NODE_CTL, &sbuf)) {
-+ return -1;
-+ }
-
- option.consolename = NULL;
-
-@@ -369,7 +374,7 @@
-
- /*....................................... Error: free all memory */
- err:
-- gpm_report(GPM_PR_ERR,"Oh, oh, it's an error! possibly I die! ");
-+ /*gpm_report(GPM_PR_ERR,"Oh, oh, it's an error! possibly I die! ");*/
- do {
- new=gpm_stack->next;
- free(gpm_stack);
Deleted: gpm.patch
===================================================================
--- gpm.patch 2008-04-22 00:29:02 UTC (rev 706)
+++ gpm.patch 2008-04-22 01:27:20 UTC (rev 707)
@@ -1,29 +0,0 @@
-diff -Naur gpm-1.20.0-orig/doc/Makefile.in gpm-1.20.0/doc/Makefile.in
---- gpm-1.20.0-orig/doc/Makefile.in 2002-02-23 07:42:23.000000000 -0800
-+++ gpm-1.20.0/doc/Makefile.in 2002-08-20 13:06:46.000000000 -0700
-@@ -44,11 +44,11 @@
-
- # PS (dvips)
- %.ps: %.dvi
-- if [ $(DVIPS) != "no" ]; then $(DVIPS) -f $< > $@; fi
-+# if [ $(DVIPS) != "no" ]; then $(DVIPS) -f $< > $@; fi
-
- # INFO (makeinfo)
- %.info: %.texinfo
-- if [ "$(MAKEINFO)" != "no" ]; then $(MAKEINFO) $< -o $@; fi
-+# if [ "$(MAKEINFO)" != "no" ]; then $(MAKEINFO) $< -o $@; fi
-
- # TXT (-)
- %.txt: %.info
---- gpm-1.20.1.old/src/lib/liblow.c 2002-12-25 03:57:16.000000000 +0500
-+++ gpm-1.20.1/src/lib/liblow.c 2003-05-02 21:51:37.000000000 +0600
-@@ -199,7 +199,8 @@
- Gpm_Stst *new = NULL;
- char* sock_name = 0;
-
-- option.consolename = NULL;
-+ if (!checked_con)
-+ option.consolename = NULL;
-
- gpm_report(GPM_PR_DEBUG,"VC: %d",flag);
-
More information about the arch-commits
mailing list