From f7e4a52c5d746606cfa5345919a9a05c738afbe5 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Fri, 30 May 2008 23:13:10 +1000 Subject: gpm: 1.20.3 -> 1.20.4 --- gpm/.footprint | 5 +-- gpm/.md5sum | 10 +++--- gpm/Pkgfile | 6 ++-- gpm/gpm-1.20.3-make-install-fixes.patch | 53 ----------------------------- gpm/gpm-1.20.3-no-dumb-error-messages.patch | 12 ------- gpm/gpm-1.20.3-no-emacs-dir.patch | 11 ------ gpm/gpm-1.20.3-nodebug.patch | 15 -------- gpm/gpm-1.20.4-make-install-fixes.patch | 53 +++++++++++++++++++++++++++++ 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 ++++++++ 11 files changed, 103 insertions(+), 100 deletions(-) delete mode 100644 gpm/gpm-1.20.3-make-install-fixes.patch delete mode 100644 gpm/gpm-1.20.3-no-dumb-error-messages.patch delete mode 100644 gpm/gpm-1.20.3-no-emacs-dir.patch delete mode 100644 gpm/gpm-1.20.3-nodebug.patch create mode 100644 gpm/gpm-1.20.4-make-install-fixes.patch create mode 100644 gpm/gpm-1.20.4-no-dumb-error-messages.patch create mode 100644 gpm/gpm-1.20.4-no-emacs-dir.patch create mode 100644 gpm/gpm-1.20.4-nodebug.patch (limited to 'gpm') diff --git a/gpm/.footprint b/gpm/.footprint index 13cb192f4..7eacecd9a 100644 --- a/gpm/.footprint +++ b/gpm/.footprint @@ -14,8 +14,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.1.20.0 --rw-r--r-- root/root usr/lib/libgpm.so.1.20.0 +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 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 664ab8ce0..30bda79ef 100644 --- a/gpm/.md5sum +++ b/gpm/.md5sum @@ -1,6 +1,6 @@ -35b2982a699fde759f77c0d96bd93036 gpm-1.20.3-make-install-fixes.patch -d755c8a2f5a96c7380dbb5322c99322b gpm-1.20.3-no-dumb-error-messages.patch -fde77ebb9594d9b1b66811850705214a gpm-1.20.3-no-emacs-dir.patch -6dd8a9e02b59dc2721f694e2c72e028e gpm-1.20.3-nodebug.patch -dd6054c488fc36fec327acc5b1f3e7d6 gpm-1.20.3.tar.bz2 +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 e8160a72365d3c79064ff76fbb7bfc70 gpm.rc diff --git a/gpm/Pkgfile b/gpm/Pkgfile index 423edacdd..4c5f4075b 100644 --- a/gpm/Pkgfile +++ b/gpm/Pkgfile @@ -4,7 +4,7 @@ # Packager: Han Boetes, han at mijncomputer dot nl name=gpm -version=1.20.3 +version=1.20.4 release=1 source=(http://unix.schottelius.org/gpm/archives/gpm-$version.tar.bz2 \ gpm-$version-no-emacs-dir.patch \ @@ -28,7 +28,9 @@ build() { make -j 1 make ROOT=$PKG install - install -m 0755 -D ../gpm.rc $PKG/etc/rc.d/gpm + ln -s libgpm.so.2.0.0 $PKG/usr/lib/libgpm.so + install -m 0755 -D $SRC/gpm.rc $PKG/etc/rc.d/gpm + rm -r $PKG/usr/share/info rmdir $PKG/usr/etc rmdir $PKG/usr/share diff --git a/gpm/gpm-1.20.3-make-install-fixes.patch b/gpm/gpm-1.20.3-make-install-fixes.patch deleted file mode 100644 index 803c6622f..000000000 --- a/gpm/gpm-1.20.3-make-install-fixes.patch +++ /dev/null @@ -1,53 +0,0 @@ -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 - echo "${ECHO_T}no" >&6; } - fi - -- -- --if test ${ac_cv_path_emacs} = no ; then -- EMACS=: -- ELISP= --else -- EMACS=${ac_cv_path_emacs} -- ELISP="emacs/t-mouse.el emacs/t-mouse.elc" --fi -+EMACS=: -+ELISP= - - 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 -@@ -32,7 +32,7 @@ include $(top_builddir)/Makefile.include - - MANPAGES = gpm.8 mev.1 gpm-root.1 gpm-types.7 mouse-test.1 - --all: $(srcdir)/gpm.info gpm.man -+all: gpm.man - - # HTML (texi2html) - %.html: %.texinfo diff --git a/gpm/gpm-1.20.3-no-dumb-error-messages.patch b/gpm/gpm-1.20.3-no-dumb-error-messages.patch deleted file mode 100644 index 8b85a273d..000000000 --- a/gpm/gpm-1.20.3-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.3-no-emacs-dir.patch b/gpm/gpm-1.20.3-no-emacs-dir.patch deleted file mode 100644 index d3edf560d..000000000 --- a/gpm/gpm-1.20.3-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.3-nodebug.patch b/gpm/gpm-1.20.3-nodebug.patch deleted file mode 100644 index 282651925..000000000 --- a/gpm/gpm-1.20.3-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.4-make-install-fixes.patch new file mode 100644 index 000000000..803c6622f --- /dev/null +++ b/gpm/gpm-1.20.4-make-install-fixes.patch @@ -0,0 +1,53 @@ +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 + echo "${ECHO_T}no" >&6; } + fi + +- +- +-if test ${ac_cv_path_emacs} = no ; then +- EMACS=: +- ELISP= +-else +- EMACS=${ac_cv_path_emacs} +- ELISP="emacs/t-mouse.el emacs/t-mouse.elc" +-fi ++EMACS=: ++ELISP= + + 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 +@@ -32,7 +32,7 @@ include $(top_builddir)/Makefile.include + + MANPAGES = gpm.8 mev.1 gpm-root.1 gpm-types.7 mouse-test.1 + +-all: $(srcdir)/gpm.info gpm.man ++all: gpm.man + + # HTML (texi2html) + %.html: %.texinfo diff --git a/gpm/gpm-1.20.4-no-dumb-error-messages.patch b/gpm/gpm-1.20.4-no-dumb-error-messages.patch new file mode 100644 index 000000000..8b85a273d --- /dev/null +++ b/gpm/gpm-1.20.4-no-dumb-error-messages.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000..d3edf560d --- /dev/null +++ b/gpm/gpm-1.20.4-no-emacs-dir.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000..282651925 --- /dev/null +++ b/gpm/gpm-1.20.4-nodebug.patch @@ -0,0 +1,15 @@ +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) { -- cgit v1.2.3