From 0156c123c713f1d850dd4bd7cf464eeec2fd80c9 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Sun, 16 May 2004 19:13:45 +0000 Subject: [PATCH] Rene Rebe: cleaned kasc/openh323, rene/xine due to new per xsrctar patchfile automatic (only partly tested) removed lingering patch from rene/coda [2004050801525319027] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2956 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../{pwlib.patch => bison-fix.patch.pwlib} | 0 package/kasc/openh323/openh323.conf | 5 --- package/kasc/openh323/openh323.desc | 4 +- package/rene/coda/coda.desc | 2 +- package/rene/coda/yacc-fix.patch.manual | 38 ------------------- ...e-goom.fix => disable-goom.patch.xine-lib} | 0 .../xine/{ui-doc.fix => doc.patch.xine-ui} | 0 package/rene/xine/xine.conf | 37 ------------------ package/rene/xine/xine.desc | 5 +-- ...xv-xm-linking.fix => xv-xm.patch.xine-lib} | 0 10 files changed, 4 insertions(+), 87 deletions(-) rename package/kasc/openh323/{pwlib.patch => bison-fix.patch.pwlib} (100%) delete mode 100644 package/rene/coda/yacc-fix.patch.manual rename package/rene/xine/{disable-goom.fix => disable-goom.patch.xine-lib} (100%) rename package/rene/xine/{ui-doc.fix => doc.patch.xine-ui} (100%) delete mode 100644 package/rene/xine/xine.conf rename package/rene/xine/{xv-xm-linking.fix => xv-xm.patch.xine-lib} (100%) diff --git a/package/kasc/openh323/pwlib.patch b/package/kasc/openh323/bison-fix.patch.pwlib similarity index 100% rename from package/kasc/openh323/pwlib.patch rename to package/kasc/openh323/bison-fix.patch.pwlib diff --git a/package/kasc/openh323/openh323.conf b/package/kasc/openh323/openh323.conf index 6688b3965..bceb6106b 100644 --- a/package/kasc/openh323/openh323.conf +++ b/package/kasc/openh323/openh323.conf @@ -21,8 +21,6 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -autopatch=0 - var_append makeopt " " "opt" var_append makeinstopt " " "PREFIX=$root/$prefix" @@ -39,7 +37,6 @@ openh323_preconf() { fi var_append confopt ' ' '--enable-plugins' var_append confopt ' ' '--enable-openldap' - patch -p 1 < $confdir/pwlib.patch fi } @@ -50,9 +47,7 @@ openh323_premake() { } openh323_inmake() { - echo "INMAKE" if [[ $xsrctar = *pwlib* ]] ; then - echo "APPLYING PATCH" rm -rf $libdir/libpt.so $root/$prefix/include/ptclib \ $root/$prefix/include/ptlib fi diff --git a/package/kasc/openh323/openh323.desc b/package/kasc/openh323/openh323.desc index 9573e7ab9..948f10d0f 100644 --- a/package/kasc/openh323/openh323.desc +++ b/package/kasc/openh323/openh323.desc @@ -58,8 +58,8 @@ [V] 1_6_5 1_13_4 [P] X -----5---9 853.000 +[SRC] . + [D] 2657294752 pwlib-v1_6_5-src.tar.gz http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/ [D] 1498707448 openh323-v1_13_4-src.tar.gz http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/ -[SRC] pwlib openh323 - diff --git a/package/rene/coda/coda.desc b/package/rene/coda/coda.desc index a3f6e1991..fdc739b3f 100644 --- a/package/rene/coda/coda.desc +++ b/package/rene/coda/coda.desc @@ -56,7 +56,7 @@ [V] 6.0.3 [P] X -----5---9 783.000 -[SRC] lwp rvm rpc2 coda +[SRC] . [D] 3799611571 lwp-1.10.tar.gz ftp://ftp.coda.cs.cmu.edu/pub/lwp/src/ [D] 2054301686 rvm-1.8.tar.gz ftp://ftp.coda.cs.cmu.edu/pub/rvm/src/ diff --git a/package/rene/coda/yacc-fix.patch.manual b/package/rene/coda/yacc-fix.patch.manual deleted file mode 100644 index 2b070369c..000000000 --- a/package/rene/coda/yacc-fix.patch.manual +++ /dev/null @@ -1,38 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/coda/yacc-fix.patch.manual -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./coda-src/asr/resolver_parser.c 2003-04-02 12:44:57.000000000 +0200 -+++ ./coda-src/asr/resolver_parser.c 2003-04-02 12:46:04.000000000 +0200 -@@ -1322,13 +1322,6 @@ - `----------------------------------------------------*/ - yyerrlab1: - -- /* Suppress GCC warning that yyerrlab1 is unused when no action -- invokes YYERROR. */ --#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) -- __attribute__ ((__unused__)) --#endif -- -- - goto yyerrlab2; - - diff --git a/package/rene/xine/disable-goom.fix b/package/rene/xine/disable-goom.patch.xine-lib similarity index 100% rename from package/rene/xine/disable-goom.fix rename to package/rene/xine/disable-goom.patch.xine-lib diff --git a/package/rene/xine/ui-doc.fix b/package/rene/xine/doc.patch.xine-ui similarity index 100% rename from package/rene/xine/ui-doc.fix rename to package/rene/xine/doc.patch.xine-ui diff --git a/package/rene/xine/xine.conf b/package/rene/xine/xine.conf deleted file mode 100644 index 32ff48a73..000000000 --- a/package/rene/xine/xine.conf +++ /dev/null @@ -1,37 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/xine/xine.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -xine_pc(){ - local each - if [[ $xsrctar = *xine-lib* ]] ; then - for each in $xine_lib_fixes; do - patch -p1 < $confdir/$each - done - fi - if [[ $xsrctar = *xine-ui* ]] ; then - for each in $xine_ui_fixes; do - patch -p1 < $confdir/$each - done - fi -} - -hook_add preconf 3 xine_pc diff --git a/package/rene/xine/xine.desc b/package/rene/xine/xine.desc index d656ac1e7..92a436623 100644 --- a/package/rene/xine/xine.desc +++ b/package/rene/xine/xine.desc @@ -45,10 +45,7 @@ [V] 1-rc4 [P] X -----5---9 951.000 -[O] xine_lib_fixes="disable-goom.fix xv-xm-linking.fix" -[O] xine_ui_fixes="ui-doc.fix" - -[SRC] xine +[SRC] . [D] 3747759436 xine-lib-1-rc4.tar.gz http://dl.sourceforge.net/xine/ [D] 941316689 xine-ui-0.99.1.tar.gz http://dl.sourceforge.net/xine/ diff --git a/package/rene/xine/xv-xm-linking.fix b/package/rene/xine/xv-xm.patch.xine-lib similarity index 100% rename from package/rene/xine/xv-xm-linking.fix rename to package/rene/xine/xv-xm.patch.xine-lib