Browse Source

Fixed kdelibs to build again by removing the not-applieable libz_dep.patch

early
Christian Wiese 17 years ago
parent
commit
470b212c4c
  1. 49
      kde/kdelibs/libz_dep.patch

49
kde/kdelibs/libz_dep.patch

@ -1,49 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../kdelibs/libz_dep.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# 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.
# --- SDE-COPYRIGHT-NOTE-END ---
--- kdelibs-3.4.2/configure.orig 2005-09-05 23:43:44.904109000 +0200
+++ kdelibs-3.4.2/configure 2005-09-05 23:44:25.946674000 +0200
@@ -33350,9 +33350,9 @@
kde_save_LIBS="$LIBS"
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
+LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ -lpng -lm -lX11 $LIBSOCKET"
else
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
+LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ -lpng -lm"
fi
kde_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
@@ -33400,7 +33400,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
+ eval "ac_cv_lib_png='$LIBZ -lpng -lm'"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
--- kdelibs-3.4.2/kimgio/Makefile.in.orig 2005-07-20 23:20:14.000000000 +0200
+++ kdelibs-3.4.2/kimgio/Makefile.in 2005-09-06 00:12:23.587520000 +0200
@@ -636,7 +636,7 @@
#>- kimg_exr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
#>+ 1
kimg_exr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
-kimg_exr_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_EXR)
+kimg_exr_la_LIBADD = $(LIB_EXR) $(LIB_KDECORE) $(LIB_QT)
kimg_dds_la_SOURCES = dds.cpp
#>- kimg_dds_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
#>+ 1
Loading…
Cancel
Save