From e474fa547cd3e6a3242ed006854784f584439cf4 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Tue, 8 Mar 2005 13:32:00 +0000 Subject: [PATCH] Clifford Wolf: Removed gnomesword and pixieplus packages They are horribly broken and de-facto unmaintained git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5676 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/public/gnomesword/glib-h-fix.patch | 235 ------------------- package/public/gnomesword/gnomesword.cache | 81 ------- package/public/gnomesword/gnomesword.conf | 26 -- package/public/gnomesword/gnomesword.desc | 43 ---- package/public/gnomesword/gnomesword.desktop | 9 - package/public/pixieplus/gcc34.patch | 116 --------- package/public/pixieplus/pixieplus.cache | 89 ------- package/public/pixieplus/pixieplus.conf | 24 -- package/public/pixieplus/pixieplus.desc | 48 ---- package/public/pixieplus/shared-files.patch | 39 --- 10 files changed, 710 deletions(-) delete mode 100644 package/public/gnomesword/glib-h-fix.patch delete mode 100644 package/public/gnomesword/gnomesword.cache delete mode 100644 package/public/gnomesword/gnomesword.conf delete mode 100644 package/public/gnomesword/gnomesword.desc delete mode 100644 package/public/gnomesword/gnomesword.desktop delete mode 100644 package/public/pixieplus/gcc34.patch delete mode 100644 package/public/pixieplus/pixieplus.cache delete mode 100644 package/public/pixieplus/pixieplus.conf delete mode 100644 package/public/pixieplus/pixieplus.desc delete mode 100644 package/public/pixieplus/shared-files.patch diff --git a/package/public/gnomesword/glib-h-fix.patch b/package/public/gnomesword/glib-h-fix.patch deleted file mode 100644 index e669ae65d..000000000 --- a/package/public/gnomesword/glib-h-fix.patch +++ /dev/null @@ -1,235 +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/jsaw/gnomesword/glib-h-fix.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -urN gnomesword-2.1.1/src/backend/config.cc gnomesword-2.1.1-jsaw/src/backend/config.cc ---- gnomesword-2.1.1/src/backend/config.cc 2004-05-15 17:02:56.000000000 +0200 -+++ gnomesword-2.1.1-jsaw/src/backend/config.cc 2004-08-09 03:52:23.906843024 +0200 -@@ -43,7 +43,7 @@ - #include - #include - --#include -+#include - - #include "config.hh" - #include "sword_main.hh" -diff -urN gnomesword-2.1.1/src/backend/config.hh gnomesword-2.1.1-jsaw/src/backend/config.hh ---- gnomesword-2.1.1/src/backend/config.hh 2004-03-18 21:45:40.000000000 +0100 -+++ gnomesword-2.1.1-jsaw/src/backend/config.hh 2004-08-09 03:52:23.908842720 +0200 -@@ -25,7 +25,7 @@ - #ifdef __cplusplus - extern "C" { - #endif --#include -+#include - //#include "main/sword.h" - - int backend_open_config_file(char *file); -diff -urN gnomesword-2.1.1/src/backend/module_manager.cc gnomesword-2.1.1-jsaw/src/backend/module_manager.cc ---- gnomesword-2.1.1/src/backend/module_manager.cc 2004-05-15 16:53:00.000000000 +0200 -+++ gnomesword-2.1.1-jsaw/src/backend/module_manager.cc 2004-08-09 03:52:23.914841808 +0200 -@@ -31,7 +31,7 @@ - #endif - - #ifdef USE_GNOME2 --#include -+#include - #include - #else - #include -diff -urN gnomesword-2.1.1/src/backend/sword.cpp gnomesword-2.1.1-jsaw/src/backend/sword.cpp ---- gnomesword-2.1.1/src/backend/sword.cpp 2004-07-14 16:31:50.000000000 +0200 -+++ gnomesword-2.1.1-jsaw/src/backend/sword.cpp 2004-08-09 03:52:23.917841352 +0200 -@@ -31,7 +31,7 @@ - #endif - - --#include -+#include - #include - #include - #include -diff -urN gnomesword-2.1.1/src/main/bibletext.c gnomesword-2.1.1-jsaw/src/main/bibletext.c ---- gnomesword-2.1.1/src/main/bibletext.c 2004-05-15 16:40:42.000000000 +0200 -+++ gnomesword-2.1.1-jsaw/src/main/bibletext.c 2004-08-09 03:52:23.920840896 +0200 -@@ -24,7 +24,7 @@ - #endif - - #ifdef USE_GNOME2 --#include -+#include - #else - #include - #endif -diff -urN gnomesword-2.1.1/src/main/commentary.cc gnomesword-2.1.1-jsaw/src/main/commentary.cc ---- gnomesword-2.1.1/src/main/commentary.cc 2004-04-21 22:57:50.000000000 +0200 -+++ gnomesword-2.1.1-jsaw/src/main/commentary.cc 2004-08-09 03:52:23.923840440 +0200 -@@ -27,7 +27,7 @@ - #include - #include - --#include -+#include - - #include "main/commentary.h" - #include "main/settings.h" -diff -urN gnomesword-2.1.1/src/main/configs.c gnomesword-2.1.1-jsaw/src/main/configs.c ---- gnomesword-2.1.1/src/main/configs.c 2003-09-03 19:52:54.000000000 +0200 -+++ gnomesword-2.1.1-jsaw/src/main/configs.c 2004-08-09 03:52:23.928839680 +0200 -@@ -24,7 +24,7 @@ - #endif - - #ifdef USE_GNOME2 --#include -+#include - #else - #include - #endif -diff -urN gnomesword-2.1.1/src/main/configs.h gnomesword-2.1.1-jsaw/src/main/configs.h ---- gnomesword-2.1.1/src/main/configs.h 2004-03-18 21:45:41.000000000 +0100 -+++ gnomesword-2.1.1-jsaw/src/main/configs.h 2004-08-09 03:52:23.930839376 +0200 -@@ -25,7 +25,7 @@ - #ifdef __cplusplus - extern "C" { - #endif --#include -+#include - - typedef struct _mod_font MOD_FONT; - struct _mod_font { -diff -urN gnomesword-2.1.1/src/main/dictlex.c gnomesword-2.1.1-jsaw/src/main/dictlex.c ---- gnomesword-2.1.1/src/main/dictlex.c 2004-04-21 22:57:50.000000000 +0200 -+++ gnomesword-2.1.1-jsaw/src/main/dictlex.c 2004-08-09 03:52:23.932839072 +0200 -@@ -24,7 +24,7 @@ - #endif - - #ifdef USE_GNOME2 --#include -+#include - #else - #include - #endif -diff -urN gnomesword-2.1.1/src/main/lists.cc gnomesword-2.1.1-jsaw/src/main/lists.cc ---- gnomesword-2.1.1/src/main/lists.cc 2004-05-15 16:53:00.000000000 +0200 -+++ gnomesword-2.1.1-jsaw/src/main/lists.cc 2004-08-09 03:52:23.936838464 +0200 -@@ -24,7 +24,7 @@ - #endif - - #include --#include -+#include - #include - - #include -diff -urN gnomesword-2.1.1/src/main/lists.h gnomesword-2.1.1-jsaw/src/main/lists.h ---- gnomesword-2.1.1/src/main/lists.h 2004-03-18 21:45:41.000000000 +0100 -+++ gnomesword-2.1.1-jsaw/src/main/lists.h 2004-08-09 03:52:23.938838160 +0200 -@@ -27,7 +27,7 @@ - { - #endif - --#include -+#include - - typedef struct _module_lists MOD_LISTS; - struct _module_lists { -diff -urN gnomesword-2.1.1/src/main/mod_mgr.c gnomesword-2.1.1-jsaw/src/main/mod_mgr.c ---- gnomesword-2.1.1/src/main/mod_mgr.c 2004-05-14 22:27:44.000000000 +0200 -+++ gnomesword-2.1.1-jsaw/src/main/mod_mgr.c 2004-08-09 03:52:23.942837552 +0200 -@@ -24,7 +24,7 @@ - #endif - - #ifdef USE_GNOME2 --#include -+#include - #include - #else - #include -diff -urN gnomesword-2.1.1/src/main/percomm.c gnomesword-2.1.1-jsaw/src/main/percomm.c ---- gnomesword-2.1.1/src/main/percomm.c 2004-04-21 22:57:56.000000000 +0200 -+++ gnomesword-2.1.1-jsaw/src/main/percomm.c 2004-08-09 03:52:23.945837096 +0200 -@@ -25,7 +25,7 @@ - - - #ifdef USE_GNOME2 --#include -+#include - #else - #include - #endif -diff -urN gnomesword-2.1.1/src/main/search_dialog.h gnomesword-2.1.1-jsaw/src/main/search_dialog.h ---- gnomesword-2.1.1/src/main/search_dialog.h 2004-05-13 21:48:27.000000000 +0200 -+++ gnomesword-2.1.1-jsaw/src/main/search_dialog.h 2004-08-09 03:52:23.947836792 +0200 -@@ -26,7 +26,7 @@ - extern "C" { - #endif - --#include -+#include - - void main_dialog_search_percent_update(char percent, void *userData); - void main_range_text_changed(GtkEditable * editable); -diff -urN gnomesword-2.1.1/src/main/search_sidebar.h gnomesword-2.1.1-jsaw/src/main/search_sidebar.h ---- gnomesword-2.1.1/src/main/search_sidebar.h 2004-04-21 22:58:01.000000000 +0200 -+++ gnomesword-2.1.1-jsaw/src/main/search_sidebar.h 2004-08-09 03:52:23.949836488 +0200 -@@ -26,7 +26,7 @@ - extern "C" { - #endif - --#include -+#include - - void main_sidebar_search_percent_update(char percent, void *userData); - void main_do_sidebar_search(gpointer user_data); -diff -urN gnomesword-2.1.1/src/main/settings.c gnomesword-2.1.1-jsaw/src/main/settings.c ---- gnomesword-2.1.1/src/main/settings.c 2004-05-18 02:24:17.000000000 +0200 -+++ gnomesword-2.1.1-jsaw/src/main/settings.c 2004-08-09 03:52:23.955835576 +0200 -@@ -25,7 +25,7 @@ - #endif - - #ifdef USE_GNOME2 --#include -+#include - #else - #include - #endif -diff -urN gnomesword-2.1.1/src/main/spell_pspell.c gnomesword-2.1.1-jsaw/src/main/spell_pspell.c ---- gnomesword-2.1.1/src/main/spell_pspell.c 2003-12-08 16:43:55.000000000 +0100 -+++ gnomesword-2.1.1-jsaw/src/main/spell_pspell.c 2004-08-09 03:52:23.958835120 +0200 -@@ -26,7 +26,7 @@ - #ifdef USE_PSPELL - - #ifdef USE_GNOME2 --#include -+#include - #else - #include - #endif -diff -urN gnomesword-2.1.1/src/main/xml.c gnomesword-2.1.1-jsaw/src/main/xml.c ---- gnomesword-2.1.1/src/main/xml.c 2004-05-13 17:30:33.000000000 +0200 -+++ gnomesword-2.1.1-jsaw/src/main/xml.c 2004-08-09 03:52:23.968833600 +0200 -@@ -24,7 +24,7 @@ - #endif - - --#include -+#include - #include - - diff --git a/package/public/gnomesword/gnomesword.cache b/package/public/gnomesword/gnomesword.cache deleted file mode 100644 index edd2ffa19..000000000 --- a/package/public/gnomesword/gnomesword.cache +++ /dev/null @@ -1,81 +0,0 @@ -[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- -[COPY] -[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] Please add additional copyright information _after_ the line containing -[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -[COPY] -[COPY] ROCK Linux: rock-src/package/jsaw/gnomesword/gnomesword.cache -[COPY] ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -[COPY] -[COPY] This program is free software; you can redistribute it and/or modify -[COPY] it under the terms of the GNU General Public License as published by -[COPY] the Free Software Foundation; either version 2 of the License, or -[COPY] (at your option) any later version. A copy of the GNU General Public -[COPY] License can be found at Documentation/COPYING. -[COPY] -[COPY] Many people helped and are helping developing ROCK Linux. Please -[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM -[COPY] file for details. -[COPY] -[COPY] --- ROCK-COPYRIGHT-NOTE-END --- - -[TIMESTAMP] 1104912373 Wed Jan 5 09:06:13 2005 -[CONFIG-ID] 2.1.0-DEV-x86-reference-expert -[ROCKVER] 2.1.0-DEV - -[LOGS] 5-gnomesword.err - -[BUILDTIME] 1394 (5) - -[5-ERROR] patching file src/backend/sword.cpp -[5-ERROR] patching file src/main/bibletext.c -[5-ERROR] patching file src/main/commentary.cc -[5-ERROR] patching file src/main/configs.c -[5-ERROR] patching file src/main/configs.h -[5-ERROR] patching file src/main/dictlex.c -[5-ERROR] patching file src/main/lists.cc -[5-ERROR] patching file src/main/lists.h -[5-ERROR] patching file src/main/mod_mgr.c -[5-ERROR] patching file src/main/percomm.c -[5-ERROR] patching file src/main/search_dialog.h -[5-ERROR] patching file src/main/search_sidebar.h -[5-ERROR] patching file src/main/settings.c -[5-ERROR] patching file src/main/spell_pspell.c -[5-ERROR] patching file src/main/xml.c -[5-ERROR] Creating /opt/gnome28/<..> if required ... -[5-ERROR] Removing unsupported '--with-mysql-lib=/opt/mysql/lib/mysql' from configure option string. -[5-ERROR] Removing unsupported '--with-mysql-include=/opt/mysql/include/mysql' from configure option string. -[5-ERROR] Removing unsupported '--with-libpam' from configure option string. -[5-ERROR] Removing unsupported '--with-pam' from configure option string. -[5-ERROR] Autodetection for option impossible: --enable-libpam passed thru. -[5-ERROR] Autodetection for option impossible: --enable-pam passed thru. -[5-ERROR] Autodetection for option impossible: --disable-gtk-doc passed thru. -[5-ERROR] Autodetection for option impossible: --disable-gtktest passed thru. -[5-ERROR] Running bash ./configure --prefix=/opt/gnome28 --bindir=/opt/gnome28/bin --sbindir=/opt/gnome28/sbin --libdir=/opt/gnome28/lib --datadir=/opt/gnome28/share --includedir=/opt/gnome28/include --infodir=/opt/gnome28/share/info --mandir=/opt/gnome28/share/man --sysconfdir=/etc/opt/gnome28 --localstatedir=/var/opt/gnome28 --disable-debug --enable-libpam --enable-pam --build=i386-unknown-linux-gnu --host=i386-unknown-linux-gnu --disable-gtk-doc --disable-gtktest CXXFLAGS=-fpermissive -[5-ERROR] checking for a BSD-compatible install... /ROCK/build/default-2.1.0-DEV-x86-reference-expert/ROCK/tools.chroot/wrapper/install -c -[5-ERROR] checking whether build environment is sane... yes -[5-ERROR] checking for gawk... gawk -[5-ERROR] checking whether make sets $(MAKE)... yes -[5-ERROR] checking whether make sets $(MAKE)... (cached) yes -[5-ERROR] checking for pkg-config... /usr/bin/pkg-config -[5-ERROR] checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword... Package libgtkhtml-3.0 was not found in the pkg-config search path. -[5-ERROR] Perhaps you should add the directory containing `libgtkhtml-3.0.pc' -[5-ERROR] to the PKG_CONFIG_PATH environment variable -[5-ERROR] No package 'libgtkhtml-3.0' found -[5-ERROR] --- BUILD ERROR --- -[5-ERROR] Creating file list and doing final adaptions ... -[5-ERROR] Processing static lib corrections ... -[5-ERROR] Verifing the .la files ... -[5-ERROR] Found 1 files for this package. -[5-ERROR] Applying package split: 40 gnomesword:dev (/lib/.*\.(la|a|o)$|/include/) -[5-ERROR] Applying package split: 42 gnomesword:dev /pkgconfig/ -[5-ERROR] Applying package split: 60 gnomesword:doc /share/doc/ -[5-ERROR] Calculating package dependencies ... -[5-ERROR] Creating flist file ... -[5-ERROR] Creating package dependencies file ... -[5-ERROR] Creating md5sum and cksum files ... -[5-ERROR] Creating package description ... -[5-ERROR] Making post-install adaptions. -[5-ERROR] Finished building gnomesword=gnomesword. - diff --git a/package/public/gnomesword/gnomesword.conf b/package/public/gnomesword/gnomesword.conf deleted file mode 100644 index c7c9ecb87..000000000 --- a/package/public/gnomesword/gnomesword.conf +++ /dev/null @@ -1,26 +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/jsaw/gnomesword/gnomesword.conf -# ROCK Linux is Copyright (C) 1998 - 2005 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 --- - -. $base/package/*/*/gnome-2.conf - -# workaround for gcc34 -var_append confopt " " "CXXFLAGS=-fpermissive" diff --git a/package/public/gnomesword/gnomesword.desc b/package/public/gnomesword/gnomesword.desc deleted file mode 100644 index 6726cfa45..000000000 --- a/package/public/gnomesword/gnomesword.desc +++ /dev/null @@ -1,43 +0,0 @@ - -[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- -[COPY] -[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] Please add additional copyright information _after_ the line containing -[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -[COPY] -[COPY] ROCK Linux: rock-src/package/jsaw/gnomesword/gnomesword.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -[COPY] -[COPY] This program is free software; you can redistribute it and/or modify -[COPY] it under the terms of the GNU General Public License as published by -[COPY] the Free Software Foundation; either version 2 of the License, or -[COPY] (at your option) any later version. A copy of the GNU General Public -[COPY] License can be found at Documentation/COPYING. -[COPY] -[COPY] Many people helped and are helping developing ROCK Linux. Please -[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM -[COPY] file for details. -[COPY] -[COPY] --- ROCK-COPYRIGHT-NOTE-END --- - -[I] Bible Study Software for GNOME - -[T] Bible Study Software for the Linux community. Lookup and search Bible -[T] texts and commentaries. GnomeSword uses the Sword Projects modules and -[T] libs. - -[U] http://gnomesword.sourceforge.net/ - -[A] Terry Biggs -[A] The SWORD team -[M] Juergen "George" Sawinski - -[C] extra/religion - -[L] GPL -[S] Stable -[V] 2.1.1 -[P] X -?---5---9 154.800 - -[D] 2805300238 gnomesword-2.1.1.tar.gz http://dl.sourceforge.net/gnomesword/ diff --git a/package/public/gnomesword/gnomesword.desktop b/package/public/gnomesword/gnomesword.desktop deleted file mode 100644 index 3d57b6d15..000000000 --- a/package/public/gnomesword/gnomesword.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=GnomeSword -Comment=Bible Study Software -Exec=gnomesword -Terminal=false -Type=Application -Categories=Utility -X-ROCK-Name=gnomesword diff --git a/package/public/pixieplus/gcc34.patch b/package/public/pixieplus/gcc34.patch deleted file mode 100644 index 928d72446..000000000 --- a/package/public/pixieplus/gcc34.patch +++ /dev/null @@ -1,116 +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/pixieplus/gcc34.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./misc/qxcfi.cpp.orig 2004-09-11 04:07:59.151740064 +0200 -+++ ./misc/qxcfi.cpp 2004-09-11 04:08:05.571764072 +0200 -@@ -1342,7 +1342,7 @@ - bool XCFImageFormat::loadProperty ( QDataStream& xcf_io, PropType& type, - QByteArray& bytes ) - { -- xcf_io >> (Q_UINT32)type; -+ xcf_io >> (Q_UINT32&)type; - - if ( xcf_io.device()->status() != IO_Ok ) { - qDebug( "XCF: read failure on property type" ); ---- ./app/batch.cpp.orig 2004-09-11 04:12:22.211748864 +0200 -+++ ./app/batch.cpp 2004-09-11 04:13:43.471395520 +0200 -@@ -196,7 +196,7 @@ - connect(bbox->addButton(i18n("Cancel")), SIGNAL(clicked()), this, - SLOT(reject())); - layout->addWidget(bbox); --}; -+} - - KIFShadeDialog::KIFShadeDialog(QWidget *parent, const char *name) - : QDialog(parent, name, true) -@@ -228,7 +228,7 @@ - connect(bbox->addButton(i18n("Cancel")), SIGNAL(clicked()), this, - SLOT(reject())); - layout->addWidget(bbox); --}; -+} - - KIFTextDialog::KIFTextDialog(QWidget *parent, const char *name) - : QDialog(parent, name, true) ---- ./app/batch.h.orig 2004-09-11 04:12:32.822135840 +0200 -+++ ./app/batch.h 2004-09-11 04:12:50.375467328 +0200 -@@ -17,7 +17,7 @@ - #define off_t long long - extern "C"{ - #include --}; -+} - - class KProgress; - class QLabel; ---- ./app/ifapp.h.orig 2004-09-11 04:12:37.881366720 +0200 -+++ ./app/ifapp.h 2004-09-11 04:13:18.392208136 +0200 -@@ -14,7 +14,7 @@ - #define off_t long long - extern "C"{ - #include --}; -+} - - class KIFFileList; - class KIFImage; ---- ./app/imageutils.cpp.orig 2004-09-11 04:17:17.323885000 +0200 -+++ ./app/imageutils.cpp 2004-09-11 04:17:24.803747888 +0200 -@@ -23,7 +23,7 @@ - #define off_t long long - extern "C"{ - #include --}; -+} - - // in compressedgif.cpp - unsigned int WriteCompressedGIFImage(const ImageInfo *image_info, ---- ./app/main.cpp.orig 2004-09-11 04:17:51.949621088 +0200 -+++ ./app/main.cpp 2004-09-11 04:17:59.114531856 +0200 -@@ -21,7 +21,7 @@ - #define off_t long long - extern "C"{ - #include --}; -+} - - - /* Signal handlers. We install them for pretty much everything that can ---- ./app/rightclick.cpp.orig 2004-09-11 04:15:50.851030872 +0200 -+++ ./app/rightclick.cpp 2004-09-11 04:16:31.609834592 +0200 -@@ -220,7 +220,7 @@ - idx = -1; - } - if(idx != -1){ -- QStringList itemList(view->itemCatagories(&itemList[idx])); -+ QStringList itemList(view->itemCatagories((Thumbnail *)&itemList[idx])); - for(it=catList.begin(), i=1000; it != catList.end(); ++it, ++i){ - if(itemList.findIndex((*it)) == -1) - addMnu->insertItem((*it), i); ---- ./app/screengrab.cpp.orig 2004-09-11 04:14:32.614924568 +0200 -+++ ./app/screengrab.cpp 2004-09-11 04:14:39.452885040 +0200 -@@ -125,7 +125,7 @@ - while(inLoop) - kapp->processEvents(); - delete this; --}; -+} - - void KIFScreenGrab::slotCheckIfDelay() - { diff --git a/package/public/pixieplus/pixieplus.cache b/package/public/pixieplus/pixieplus.cache deleted file mode 100644 index a9cc418f1..000000000 --- a/package/public/pixieplus/pixieplus.cache +++ /dev/null @@ -1,89 +0,0 @@ -[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- -[COPY] -[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] Please add additional copyright information _after_ the line containing -[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -[COPY] -[COPY] ROCK Linux: rock-src/package/rene/pixieplus/pixieplus.cache -[COPY] ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -[COPY] -[COPY] This program is free software; you can redistribute it and/or modify -[COPY] it under the terms of the GNU General Public License as published by -[COPY] the Free Software Foundation; either version 2 of the License, or -[COPY] (at your option) any later version. A copy of the GNU General Public -[COPY] License can be found at Documentation/COPYING. -[COPY] -[COPY] Many people helped and are helping developing ROCK Linux. Please -[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM -[COPY] file for details. -[COPY] -[COPY] --- ROCK-COPYRIGHT-NOTE-END --- - -[TIMESTAMP] 1104912470 Wed Jan 5 09:07:50 2005 -[CONFIG-ID] 2.1.0-DEV-x86-reference-expert -[ROCKVER] 2.1.0-DEV - -[LOGS] 5-pixieplus.err - -[BUILDTIME] 2692 (5) -[SIZE] 0.02 MB, 12 files - -[DEP] 00-dirtree arts bash2 binutils bzip2 coreutils expat file -[DEP] findutils freetype gcc34 gcc34:dev gettext glibc23 glibc23:dev -[DEP] grep imagemagick:dev kdelibs libjpeg libjpeg:dev libpng libpng:dev -[DEP] libtiff:dev libungif:dev linux26-header:dev make mktemp net-tools -[DEP] patch qt qt:dev sed sysfiles tar util-linux xfree86 xfree86:dev -[DEP] zlib:dev - -[5-ERROR] checking for extra includes... no -[5-ERROR] checking for extra libs... no -[5-ERROR] checking for libz... -lz -[5-ERROR] checking for libpng... -lpng -lz -lm -[5-ERROR] checking for libjpeg6b... no -[5-ERROR] checking for libjpeg... -ljpeg -[5-ERROR] checking for Qt... libraries /opt/qt33/lib, headers /opt/qt33/include using -mt -[5-ERROR] checking for moc... /opt/qt33/bin/moc -[5-ERROR] checking for uic... /opt/qt33/bin/uic -[5-ERROR] checking whether uic supports -L ... yes -[5-ERROR] checking whether uic supports -nounload ... yes -[5-ERROR] checking if Qt needs -ljpeg... no -[5-ERROR] checking for rpath... yes -[5-ERROR] checking for KDE... libraries /opt/kde3/lib, headers /opt/kde3/include -[5-ERROR] checking for KDE paths... defaults -[5-ERROR] checking for dcopidl... /opt/kde3/bin/dcopidl -[5-ERROR] checking for dcopidl2cpp... /opt/kde3/bin/dcopidl2cpp -[5-ERROR] checking for mcopidl... /opt/kde3/bin/mcopidl -[5-ERROR] checking for artsc-config... /opt/kde3/bin/artsc-config -[5-ERROR] checking for kde-config... /opt/kde3/bin/kde-config -[5-ERROR] checking for meinproc... /opt/kde3/bin/meinproc -[5-ERROR] checking for setenv... yes -[5-ERROR] checking for unsetenv... yes -[5-ERROR] checking for png.h... yes -[5-ERROR] checking for tiff.h... yes -[5-ERROR] checking for jpeglib.h... yes -[5-ERROR] checking for gif_lib.h... yes -[5-ERROR] checking for magick/magick.h... yes -[5-ERROR] checking for magick/resource.h... no -[5-ERROR] configure: error: Old ImageMagick headers found. You must have ImageMagick 5.5.0 or above. Read INSTALL.README! -[5-ERROR] --- BUILD ERROR --- -[5-ERROR] Creating file list and doing final adaptions ... -[5-ERROR] Processing static lib corrections ... -[5-ERROR] Verifing the .la files ... -[5-ERROR] Found 7 files for this package. -[5-ERROR] Applying package split: 40 pixieplus:dev (/lib/.*\.(la|a|o)$|/include/) -[5-ERROR] Applying package split: 42 pixieplus:dev /pkgconfig/ -[5-ERROR] Applying package split: 45 pixieplus /.*\.la$ -[5-ERROR] Applying package split: 60 pixieplus:doc /share/doc/ -[5-ERROR] Calculating package dependencies ... -[5-ERROR] Creating flist file ... -[5-ERROR] Creating package dependencies file ... -[5-ERROR] Creating md5sum and cksum files ... -[5-ERROR] Creating package description ... -[5-ERROR] Creating flist file ... -[5-ERROR] Creating package dependencies file ... -[5-ERROR] Creating md5sum and cksum files ... -[5-ERROR] Creating package description ... -[5-ERROR] Making post-install adaptions. -[5-ERROR] Finished building pixieplus=pixieplus. - diff --git a/package/public/pixieplus/pixieplus.conf b/package/public/pixieplus/pixieplus.conf deleted file mode 100644 index 4da4872e4..000000000 --- a/package/public/pixieplus/pixieplus.conf +++ /dev/null @@ -1,24 +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/pixieplus/pixieplus.conf -# ROCK Linux is Copyright (C) 1998 - 2005 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 --- - -. $base/package/*/*/kde-3.conf - diff --git a/package/public/pixieplus/pixieplus.desc b/package/public/pixieplus/pixieplus.desc deleted file mode 100644 index 93fb7acbf..000000000 --- a/package/public/pixieplus/pixieplus.desc +++ /dev/null @@ -1,48 +0,0 @@ - -[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- -[COPY] -[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] Please add additional copyright information _after_ the line containing -[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -[COPY] -[COPY] ROCK Linux: rock-src/package/rene/pixieplus/pixieplus.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -[COPY] -[COPY] This program is free software; you can redistribute it and/or modify -[COPY] it under the terms of the GNU General Public License as published by -[COPY] the Free Software Foundation; either version 2 of the License, or -[COPY] (at your option) any later version. A copy of the GNU General Public -[COPY] License can be found at Documentation/COPYING. -[COPY] -[COPY] Many people helped and are helping developing ROCK Linux. Please -[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM -[COPY] file for details. -[COPY] -[COPY] --- ROCK-COPYRIGHT-NOTE-END --- - -[I] A free and fast image browser, viewer, and editor for KDE - -[T] A free, fast, and feature packed image browser, viewer, and image/photo -[T] editor for Unix/Linux/X11 systems. -[T] -[T] Fast, flexible thumbnail preview generation, embedded JPEG and TIFF -[T] thumbnail support, lossless JPEG transformations, supports many image -[T] formats, highly configurable HTML export, batch conversion and effects, -[T] animated slideshows, similiar image finding, file management optimized -[T] for images. - -[U] http://www.mosfet.org/pixie/ - -[A] Daniel M. Duley -[M] The ROCK Linux Project - -[C] extra/office extra/desktop/kde - -[L] BSD -[S] Beta -[V] 0.5.4 -[P] X -?---5---9 167.500 - -[D] 1514603629 pixieplus-0.5.4.tar.gz http://www.mosfet.org/pixie/ - diff --git a/package/public/pixieplus/shared-files.patch b/package/public/pixieplus/shared-files.patch deleted file mode 100644 index 833a9ce0f..000000000 --- a/package/public/pixieplus/shared-files.patch +++ /dev/null @@ -1,39 +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/pixieplus/shared-files.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- pixieplus-0.5.4/mimetypes/Makefile.in 2003-02-09 05:58:13.000000000 +0100 -+++ pixieplus-0.5.4-fixed/mimetypes/Makefile.in 2003-08-22 22:52:05.000000000 +0200 -@@ -240,7 +240,7 @@ - - datadir = $(kde_mimedir)/image - --data_DATA = x-pcx.desktop x-xwd.desktop x-miff.desktop x-tga.desktop \ -+data_DATA = x-xwd.desktop x-miff.desktop x-tga.desktop \ - x-pict.desktop - - -@@ -302,7 +302,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=x-pict.desktop x-xwd.desktop x-miff.desktop x-pcx.desktop x-tga.desktop -+KDE_DIST=x-pict.desktop x-xwd.desktop x-miff.desktop x-tga.desktop - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -