From 17e38aad7ddda2ca89fb7e701193d443a7143df8 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Fri, 25 Jun 2004 12:49:27 +0000 Subject: [PATCH] Rene Rebe: * re-removed e17 patches that are obsolete (damn mv oder issue ...) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3391 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/e17/ecore/gcc34.patch | 20 ------------- package/e17/epsilon/png-compile-fix.patch | 34 ----------------------- package/e17/esmart/usr-local.patch | 32 --------------------- package/e17/imlib2/gcc34.patch | 23 --------------- 4 files changed, 109 deletions(-) delete mode 100644 package/e17/ecore/gcc34.patch delete mode 100644 package/e17/epsilon/png-compile-fix.patch delete mode 100644 package/e17/esmart/usr-local.patch delete mode 100644 package/e17/imlib2/gcc34.patch diff --git a/package/e17/ecore/gcc34.patch b/package/e17/ecore/gcc34.patch deleted file mode 100644 index 6fef17f39..000000000 --- a/package/e17/ecore/gcc34.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ecore-2004-01-18/src/lib/ecore_config/edb.c.orig 2004-05-13 14:41:41.642699904 +0200 -+++ ecore-2004-01-18/src/lib/ecore_config/edb.c 2004-05-13 14:41:55.229634376 +0200 -@@ -106,6 +106,7 @@ - break; - case PT_NIL: - /* currently we do nothing for undefined ojects */ -+ ; - } - - next=next->next; ---- ecore-2004-01-18/src/lib/ecore_fb/ecore_fb.c.orig 2004-05-13 14:37:15.076224168 +0200 -+++ ecore-2004-01-18/src/lib/ecore_fb/ecore_fb.c 2004-05-13 14:37:30.233919848 +0200 -@@ -1046,6 +1046,7 @@ - if (_ecore_fb_alt < 0) _ecore_fb_alt = 0; - } - retry: -+ ; - } - while (v > 0); - return 1; diff --git a/package/e17/epsilon/png-compile-fix.patch b/package/e17/epsilon/png-compile-fix.patch deleted file mode 100644 index 91c5f153a..000000000 --- a/package/e17/epsilon/png-compile-fix.patch +++ /dev/null @@ -1,34 +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/e17/epsilon/png-compile-fix.patch -# ROCK Linux is Copyright (C) 1998 - 2004 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 --- - -Yeah - the usual libs missing ... - - - Rene Rebe - ---- epsilon-2004-01-18/configure.in.orig 2004-02-26 16:12:34.000000000 +0100 -+++ epsilon-2004-01-18/configure.in 2004-02-26 16:12:51.000000000 +0100 -@@ -66,7 +66,7 @@ - AC_CHECK_HEADER( png.h, - [ AC_DEFINE(HAVE_PNG_H, 1, [png.h available]) - have_png="yes" -- LIBS="$LIBS -lpng" ], -+ LIBS="$LIBS -lpng -lz" ], - [ AC_MSG_ERROR(Cannot find png.h on your system, try --with-png=) ]) - AC_CHECK_LIB(png, png_create_read_struct, [ - AC_DEFINE(HAVE_PNG_LIB, 1, [libpng available]) diff --git a/package/e17/esmart/usr-local.patch b/package/e17/esmart/usr-local.patch deleted file mode 100644 index 84f8f6ab3..000000000 --- a/package/e17/esmart/usr-local.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ru esmart-2004-02-02~/configure.in esmart-2004-02-02/configure.in ---- esmart-2004-02-02~/configure.in 2004-01-17 08:16:46.000000000 +0100 -+++ esmart-2004-02-02/configure.in 2004-02-08 17:12:24.000000000 +0100 -@@ -35,7 +35,7 @@ - container_plugin_dir=${libdir}/${PACKAGE}/layout - fi - #FIXME: remove this and get it working correctly --container_plugin_dir="/usr/local/lib/esmart/layout" -+container_plugin_dir="${libdir}/esmart/layout" - AC_DEFINE_UNQUOTED(CONTAINER_PLUGIN_DIR, "${container_plugin_dir}", [Container Plugin Directory]) - AC_SUBST(container_plugin_dir) - -diff -ru esmart-2004-02-02~/src/container/layout/default/Makefile.am esmart-2004-02-02/src/container/layout/default/Makefile.am ---- esmart-2004-02-02~/src/container/layout/default/Makefile.am 2004-01-13 20:26:41.000000000 +0100 -+++ esmart-2004-02-02/src/container/layout/default/Makefile.am 2004-02-08 17:04:54.000000000 +0100 -@@ -1,5 +1,5 @@ - plugin_LTLIBRARIES = default.la --plugindir = /usr/local/lib/esmart/layout -+plugindir = $(libdir)/esmart/layout - - default_la_SOURCES = default.c - default_la_LDFLAGS = -module -avoid-version -diff -ru esmart-2004-02-02~/src/container/layout/entice/Makefile.am esmart-2004-02-02/src/container/layout/entice/Makefile.am ---- esmart-2004-02-02~/src/container/layout/entice/Makefile.am 2004-01-13 02:25:09.000000000 +0100 -+++ esmart-2004-02-02/src/container/layout/entice/Makefile.am 2004-02-08 17:04:54.000000000 +0100 -@@ -1,5 +1,5 @@ - plugin_LTLIBRARIES = entice.la --plugindir = /usr/local/lib/esmart/layout -+plugindir = $(libdir)/esmart/layout - - entice_la_SOURCES = entice.c - entice_la_LDFLAGS = -module -avoid-version diff --git a/package/e17/imlib2/gcc34.patch b/package/e17/imlib2/gcc34.patch deleted file mode 100644 index db51ed14b..000000000 --- a/package/e17/imlib2/gcc34.patch +++ /dev/null @@ -1,23 +0,0 @@ - -The usual gcc-3.4 fixes ... - - - Rene Rebe - ---- imlib2-2004-01-18-orig/src/rgbadraw.c 2003-07-13 03:09:17.000000000 +0200 -+++ imlib2-2004-01-18/src/rgbadraw.c 2004-05-05 18:31:54.920199456 +0200 -@@ -2358,6 +2358,7 @@ - if (ps) - ps->next = s; - nospans: -+ ; - } - } - if (i == y2) -@@ -2365,6 +2366,7 @@ - i += step; - } - nolines: -+ ; - } - for (i = 0; i < h; i++) - {