packages: k3b/k3b-kde3support.patch - updated

[shadzik]

Author: shadzik                      Date: Sun Jul 12 15:21:12 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated

---- Files affected:
packages/k3b:
   k3b-kde3support.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/k3b/k3b-kde3support.patch
diff -u packages/k3b/k3b-kde3support.patch:1.1 packages/k3b/k3b-kde3support.patch:1.2
--- packages/k3b/k3b-kde3support.patch:1.1	Sat Jul 11 23:47:31 2009
+++ packages/k3b/k3b-kde3support.patch	Sun Jul 12 17:21:07 2009
@@ -1,5 +1,5 @@
---- admin/acinclude.m4.in.orig	2009-07-11 23:41:59.387802510 +0200
-+++ admin/acinclude.m4.in	2009-07-11 23:43:00.084748075 +0200
+--- admin/acinclude.m4.in	2008-05-27 10:23:30.000000000 +0200
++++ admin/acinclude.m4.in-new	2009-07-12 16:17:53.748582894 +0200
 @@ -1791,11 +1791,11 @@
  AC_MSG_CHECKING([for KDE])
  
@@ -16,14 +16,16 @@
  
  else
    ac_kde_includes=
-@@ -1833,18 +1833,12 @@
+@@ -1829,7 +1829,7 @@
+ So, check this please and use another prefix!])
+ fi
+ 
+-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
++kde_libdirs="$kde_libs_prefix/lib${kdelibsuff}/kde3dev /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
  test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
  kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
  AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
--ac_kde_libraries="$kde_libdir"
-+ac_kde_libraries="$kde_libdir/kde3dev"
- 
- kde_widgetdir=NO
+@@ -1839,12 +1839,6 @@
  dnl this might be somewhere else
  AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
  
@@ -56,3 +58,74 @@
  
  AC_SUBST(AUTODIRS)
  
+--- admin/ltmain.sh	2009-07-12 16:17:37.648523138 +0200
++++ admin/ltmain.sh-new	2009-07-12 16:17:45.251231198 +0200
+@@ -5669,7 +5669,23 @@
+ 	    case $hardcode_action in
+ 	    immediate | unsupported)
+ 	      if test "$hardcode_direct" = no; then
+-		add="$dir/$linklib"
++		if test "$linklib" = "libDCOP.so"; then
++			add="$dir/kde3dev/$linklib"
++		elif test "$linklib" = "libkwalletclient.so"; then
++			add="$dir/kde3dev/$linklib"
++		elif test "$linklib" = "libkdefx.so"; then
++			add="$dir/kde3dev/$linklib"
++		elif test "$linklib" = "libkdecore.so"; then
++			add="$dir/kde3dev/$linklib"
++		elif test "$linklib" = "libkdeui.so"; then
++			add="$dir/kde3dev/$linklib"
++		elif test "$linklib" = "libkparts.so"; then
++			add="$dir/kde3dev/$linklib"
++		elif test "$linklib" = "libkio.so"; then
++			add="$dir/kde3dev/$linklib"
++		else
++			add="$dir/$linklib"
++		fi
+ 		case $host in
+ 		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+ 		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+--- admin/acinclude.m4.in-new	2009-07-12 16:59:51.390969154 +0200
++++ admin/acinclude.m4.in	2009-07-12 17:00:06.398894540 +0200
+@@ -578,7 +578,7 @@
+           KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
+           KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
+         fi
+-        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
++        KDE_FIND_PATH(meinproc4, MEINPROC, [$kde_default_bindirs])
+ 
+         kde32ornewer=1
+         kde33ornewer=1
+--- admin/am_edit	2008-05-27 10:23:30.000000000 +0200
++++ admin/am_edit-new	2009-07-12 17:03:38.005110229 +0200
+@@ -1999,7 +1999,7 @@
+       my $lines = "";
+       my $lookup = 'MEINPROC\s*=';
+       if ($MakefileData !~ /\n($lookup)/) {
+-	$lines = "MEINPROC=/\$(kde_bindir)/meinproc\n";
++	$lines = "MEINPROC=/\$(kde_bindir)/meinproc4\n";
+       }
+       $lookup = 'KDE_XSL_STYLESHEET\s*=';
+       if ($MakefileData !~ /\n($lookup)/) {
+--- k3b-i18n-1.0.5/admin/acinclude.m4.in.old	2009-07-12 17:11:48.840906438 +0200
++++ k3b-i18n-1.0.5/admin/acinclude.m4.in	2009-07-12 17:12:01.948410314 +0200
+@@ -578,7 +578,7 @@
+           KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
+           KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
+         fi
+-        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
++        KDE_FIND_PATH(meinproc4, MEINPROC, [$kde_default_bindirs])
+ 
+         kde32ornewer=1
+         kde33ornewer=1
+--- k3b-i18n-1.0.5/admin/am_edit.old	2009-07-12 17:11:52.847501698 +0200
++++ k3b-i18n-1.0.5/admin/am_edit	2009-07-12 17:12:09.890240661 +0200
+@@ -1999,7 +1999,7 @@
+       my $lines = "";
+       my $lookup = 'MEINPROC\s*=';
+       if ($MakefileData !~ /\n($lookup)/) {
+-	$lines = "MEINPROC=/\$(kde_bindir)/meinproc\n";
++	$lines = "MEINPROC=/\$(kde_bindir)/meinproc4\n";
+       }
+       $lookup = 'KDE_XSL_STYLESHEET\s*=';
+       if ($MakefileData !~ /\n($lookup)/) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/k3b/k3b-kde3support.patch?r1=1.1&r2=1.2&f=u