From 3c9cb0e5ca4d0737701bfc6ae885875906a25612 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Tue, 17 Jun 2008 10:32:52 +1000 Subject: [PATCH] gpm: 1.20.4 -> 1.20.5 --- gpm/.footprint | 7 +-- gpm/.md5sum | 9 ++-- gpm/Pkgfile | 22 ++++---- gpm/gpm-1.20.4-no-dumb-error-messages.patch | 12 ----- gpm/gpm-1.20.4-no-emacs-dir.patch | 11 ---- gpm/gpm-1.20.4-nodebug.patch | 15 ------ ...ch => gpm-1.20.5-make-install-fixes.patch} | 54 +++++++++---------- gpm/gpm-1.20.5-no-dumb-error-messages.patch | 12 +++++ gpm/gpm-1.20.5-nodebug.patch | 15 ++++++ 9 files changed, 72 insertions(+), 85 deletions(-) delete mode 100644 gpm/gpm-1.20.4-no-dumb-error-messages.patch delete mode 100644 gpm/gpm-1.20.4-no-emacs-dir.patch delete mode 100644 gpm/gpm-1.20.4-nodebug.patch rename gpm/{gpm-1.20.4-make-install-fixes.patch => gpm-1.20.5-make-install-fixes.patch} (58%) create mode 100644 gpm/gpm-1.20.5-no-dumb-error-messages.patch create mode 100644 gpm/gpm-1.20.5-nodebug.patch diff --git a/gpm/.footprint b/gpm/.footprint index 7eacecd9a..10259f660 100644 --- a/gpm/.footprint +++ b/gpm/.footprint @@ -6,6 +6,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/disable-paste -rwxr-xr-x root/root usr/bin/display-buttons -rwxr-xr-x root/root usr/bin/display-coords +-rwxr-xr-x root/root usr/bin/get-versions -rwxr-xr-x root/root usr/bin/gpm-root -rwxr-xr-x root/root usr/bin/hltest -rwxr-xr-x root/root usr/bin/mev @@ -14,9 +15,9 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/gpm.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libgpm.a -lrwxrwxrwx root/root usr/lib/libgpm.so -> libgpm.so.2.0.0 -lrwxrwxrwx root/root usr/lib/libgpm.so.2 -> libgpm.so.2.0.0 --rw-r--r-- root/root usr/lib/libgpm.so.2.0.0 +lrwxrwxrwx root/root usr/lib/libgpm.so -> libgpm.so.2.1.0 +lrwxrwxrwx root/root usr/lib/libgpm.so.2 -> libgpm.so.2.1.0 +-rw-r--r-- root/root usr/lib/libgpm.so.2.1.0 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/gpm-root.1.gz diff --git a/gpm/.md5sum b/gpm/.md5sum index 30bda79ef..391662105 100644 --- a/gpm/.md5sum +++ b/gpm/.md5sum @@ -1,6 +1,5 @@ -35b2982a699fde759f77c0d96bd93036 gpm-1.20.4-make-install-fixes.patch -d755c8a2f5a96c7380dbb5322c99322b gpm-1.20.4-no-dumb-error-messages.patch -fde77ebb9594d9b1b66811850705214a gpm-1.20.4-no-emacs-dir.patch -6dd8a9e02b59dc2721f694e2c72e028e gpm-1.20.4-nodebug.patch -c686ab7e852d1088cdd8b136dcbcd3aa gpm-1.20.4.tar.bz2 +5e87c72bc9e6543baa2a00edda3e988b gpm-1.20.5-make-install-fixes.patch +d84e482baf077c3b8c5542f4c084e3b3 gpm-1.20.5-no-dumb-error-messages.patch +bba366a0229e870451675995be2c949d gpm-1.20.5-nodebug.patch +e55473932e4052f3b74c730dfefe0d15 gpm-1.20.5.tar.bz2 e8160a72365d3c79064ff76fbb7bfc70 gpm.rc diff --git a/gpm/Pkgfile b/gpm/Pkgfile index 4c5f4075b..c60a48b98 100644 --- a/gpm/Pkgfile +++ b/gpm/Pkgfile @@ -4,31 +4,29 @@ # Packager: Han Boetes, han at mijncomputer dot nl name=gpm -version=1.20.4 +version=1.20.5 release=1 -source=(http://unix.schottelius.org/gpm/archives/gpm-$version.tar.bz2 \ - gpm-$version-no-emacs-dir.patch \ - gpm-$version-nodebug.patch \ - gpm-$version-no-dumb-error-messages.patch \ - gpm-$version-make-install-fixes.patch \ +source=(http://unix.schottelius.org/gpm/archives/gpm-$version.tar.bz2 + gpm-$version-nodebug.patch + gpm-$version-no-dumb-error-messages.patch + gpm-$version-make-install-fixes.patch gpm.rc) build() { cd gpm-$version - patch -p 1 -i ../gpm-$version-no-emacs-dir.patch - patch -p 1 -i ../gpm-$version-nodebug.patch - patch -p 1 -i ../gpm-$version-no-dumb-error-messages.patch - patch -p 1 -i ../gpm-$version-make-install-fixes.patch + patch -p 1 -i $SRC/gpm-$version-nodebug.patch + patch -p 1 -i $SRC/gpm-$version-no-dumb-error-messages.patch + patch -p 1 -i $SRC/gpm-$version-make-install-fixes.patch ./configure \ --prefix=/usr \ --mandir=/usr/man - make -j 1 + make make ROOT=$PKG install - ln -s libgpm.so.2.0.0 $PKG/usr/lib/libgpm.so + ln -s libgpm.so.2.1.0 $PKG/usr/lib/libgpm.so install -m 0755 -D $SRC/gpm.rc $PKG/etc/rc.d/gpm rm -r $PKG/usr/share/info diff --git a/gpm/gpm-1.20.4-no-dumb-error-messages.patch b/gpm/gpm-1.20.4-no-dumb-error-messages.patch deleted file mode 100644 index 8b85a273d..000000000 --- a/gpm/gpm-1.20.4-no-dumb-error-messages.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pruN gpm-1.20.3.orig/src/lib/liblow.c gpm-1.20.3/src/lib/liblow.c ---- gpm-1.20.3.orig/src/lib/liblow.c 2008-05-08 09:34:10.000000000 +0000 -+++ gpm-1.20.3/src/lib/liblow.c 2008-05-08 09:40:47.000000000 +0000 -@@ -362,7 +362,7 @@ int Gpm_Open(Gpm_Connect *conn, int flag - - /*....................................... 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! "); */ - while(gpm_stack) { - new=gpm_stack->next; - free(gpm_stack); diff --git a/gpm/gpm-1.20.4-no-emacs-dir.patch b/gpm/gpm-1.20.4-no-emacs-dir.patch deleted file mode 100644 index d3edf560d..000000000 --- a/gpm/gpm-1.20.4-no-emacs-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpm-1.20.3-orig/Makefile.in 2008-04-15 16:34:13.000000000 +0200 -+++ gpm-1.20.3/Makefile.in 2008-04-20 23:30:30.000000000 +0200 -@@ -51,7 +51,7 @@ - - installdirs: - $(MKDIR) $(libdir) $(bindir) $(sbindir) $(includedir) $(sysconfdir); \ -- if test "x@ELISP@" != "x" ; then \ -+ if test "x$(ELISP)" != "x" ; then \ - $(MKDIR) $(lispdir) ; \ - fi - diff --git a/gpm/gpm-1.20.4-nodebug.patch b/gpm/gpm-1.20.4-nodebug.patch deleted file mode 100644 index 282651925..000000000 --- a/gpm/gpm-1.20.4-nodebug.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -pruN gpm-1.20.3.orig/src/lib/report-lib.c gpm-1.20.3/src/lib/report-lib.c ---- gpm-1.20.3.orig/src/lib/report-lib.c 2008-05-08 09:34:10.000000000 +0000 -+++ gpm-1.20.3/src/lib/report-lib.c 2008-05-08 09:37:27.000000000 +0000 -@@ -29,6 +29,11 @@ void gpm_report(int line, char *file, in - char *string = NULL; - int log_level; - va_list ap; -+#ifndef DEBUG_VERBOSE -+ if(stat==GPM_STAT_DEBUG) -+ return; -+#endif -+ - va_start(ap,text); - - switch(stat) { diff --git a/gpm/gpm-1.20.4-make-install-fixes.patch b/gpm/gpm-1.20.5-make-install-fixes.patch similarity index 58% rename from gpm/gpm-1.20.4-make-install-fixes.patch rename to gpm/gpm-1.20.5-make-install-fixes.patch index 803c6622f..20f9ba0b9 100644 --- a/gpm/gpm-1.20.4-make-install-fixes.patch +++ b/gpm/gpm-1.20.5-make-install-fixes.patch @@ -1,27 +1,7 @@ -diff -pruN gpm-1.20.3.orig/Makefile.include.in gpm-1.20.3/Makefile.include.in ---- gpm-1.20.3.orig/Makefile.include.in 2008-05-08 09:44:49.000000000 +0000 -+++ gpm-1.20.3/Makefile.include.in 2008-05-08 09:51:23.000000000 +0000 -@@ -40,7 +40,6 @@ INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - LN_S = @LN_S@ --EMACS = @EMACS@ - ELISP = @ELISP@ - SHLIB = @SHLIB@ - SED = @SED@ -@@ -48,7 +47,7 @@ DIFF = @DIFF@ - TEX = @TEX@ - TEXINDEX = @TEXINDEX@ - DVIPS = @DVIPS@ --MAKEINFO = @MAKEINFO@ -+MAKEINFO = no - TEXI2HTML = texi2html - STRIP = -s - -diff -pruN gpm-1.20.3.orig/configure gpm-1.20.3/configure ---- gpm-1.20.3.orig/configure 2008-05-08 09:44:49.000000000 +0000 -+++ gpm-1.20.3/configure 2008-05-08 09:53:55.000000000 +0000 -@@ -3248,15 +3248,8 @@ else +diff -pruN gpm-1.20.5.orig/configure gpm-1.20.5/configure +--- gpm-1.20.5.orig/configure 2008-06-17 09:54:54.858258511 +1000 ++++ gpm-1.20.5/configure 2008-06-17 10:16:33.330255126 +1000 +@@ -3378,15 +3378,8 @@ else echo "${ECHO_T}no" >&6; } fi @@ -39,9 +19,9 @@ diff -pruN gpm-1.20.3.orig/configure gpm-1.20.3/configure if test $EMACS != : ; then { echo "$as_me:$LINENO: checking where to install Emacs Lisp files" >&5 -diff -pruN gpm-1.20.3.orig/doc/Makefile.in gpm-1.20.3/doc/Makefile.in ---- gpm-1.20.3.orig/doc/Makefile.in 2008-05-08 09:44:49.000000000 +0000 -+++ gpm-1.20.3/doc/Makefile.in 2008-05-08 09:57:34.000000000 +0000 +diff -pruN gpm-1.20.5.orig/doc/Makefile.in gpm-1.20.5/doc/Makefile.in +--- gpm-1.20.5.orig/doc/Makefile.in 2008-06-17 09:54:54.856257925 +1000 ++++ gpm-1.20.5/doc/Makefile.in 2008-06-17 10:18:14.557261978 +1000 @@ -32,7 +32,7 @@ include $(top_builddir)/Makefile.include MANPAGES = gpm.8 mev.1 gpm-root.1 gpm-types.7 mouse-test.1 @@ -51,3 +31,23 @@ diff -pruN gpm-1.20.3.orig/doc/Makefile.in gpm-1.20.3/doc/Makefile.in # HTML (texi2html) %.html: %.texinfo +diff -pruN gpm-1.20.5.orig/Makefile.include.in gpm-1.20.5/Makefile.include.in +--- gpm-1.20.5.orig/Makefile.include.in 2008-06-17 09:54:54.862260471 +1000 ++++ gpm-1.20.5/Makefile.include.in 2008-06-17 10:13:14.742262245 +1000 +@@ -44,7 +44,6 @@ INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + LN_S = @LN_S@ +-EMACS = @EMACS@ + ELISP = @ELISP@ + SHLIB = @SHLIB@ + SED = @SED@ +@@ -52,7 +51,7 @@ DIFF = @DIFF@ + TEX = @TEX@ + TEXINDEX = @TEXINDEX@ + DVIPS = @DVIPS@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = no + TEXI2HTML = texi2html + STRIP = -s + diff --git a/gpm/gpm-1.20.5-no-dumb-error-messages.patch b/gpm/gpm-1.20.5-no-dumb-error-messages.patch new file mode 100644 index 000000000..8cc39be85 --- /dev/null +++ b/gpm/gpm-1.20.5-no-dumb-error-messages.patch @@ -0,0 +1,12 @@ +diff -pruN gpm-1.20.5.orig/src/lib/liblow.c gpm-1.20.5/src/lib/liblow.c +--- gpm-1.20.5.orig/src/lib/liblow.c 2008-06-17 09:54:54.811257867 +1000 ++++ gpm-1.20.5/src/lib/liblow.c 2008-06-17 10:00:27.489256401 +1000 +@@ -377,7 +377,7 @@ int Gpm_Open(Gpm_Connect *conn, int flag + /*....................................... Error: free all memory */ + err: + if (gpm_is_disabled < 2) /* be quiet if no gpmctl socket found */ +- 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! "); */ + while(gpm_stack) { + new=gpm_stack->next; + free(gpm_stack); diff --git a/gpm/gpm-1.20.5-nodebug.patch b/gpm/gpm-1.20.5-nodebug.patch new file mode 100644 index 000000000..dcf0bcd45 --- /dev/null +++ b/gpm/gpm-1.20.5-nodebug.patch @@ -0,0 +1,15 @@ +Binary files gpm-1.20.5.orig/.Makefile.in.swp and gpm-1.20.5/.Makefile.in.swp differ +diff -pruN gpm-1.20.5.orig/src/lib/report-lib.c gpm-1.20.5/src/lib/report-lib.c +--- gpm-1.20.5.orig/src/lib/report-lib.c 2008-06-17 09:54:54.811257867 +1000 ++++ gpm-1.20.5/src/lib/report-lib.c 2008-06-17 10:08:36.780265133 +1000 +@@ -29,6 +29,10 @@ void gpm_report(int line, char *file, in + char *string = NULL; + int log_level; + va_list ap; ++#ifndef DEBUG_VERBOSE ++ if(stat==GPM_STAT_DEBUG) ++ return; ++#endif + + if (stat == GPM_STAT_DEBUG) return; +