lxde updates

3 files changed, 150 insertions, 0 deletions

diff --git a/package/pcmanfm/patches/patch-ltmain_sh b/package/pcmanfm/patches/patch-ltmain_sh
new file mode 100644
index 000000000..207a1b457
--- /dev/null
+++ b/package/pcmanfm/patches/patch-ltmain_sh
@@ -0,0 +1,80 @@
+--- pcmanfm-2.0.orig/ltmain.sh	2011-04-14 20:46:32.000000000 +0200
++++ pcmanfm-2.0/ltmain.sh	2011-04-16 12:32:18.000000000 +0200
+@@ -4216,19 +4216,6 @@ func_mode_link ()
+ 	  prev=
+ 	  continue
+ 	  ;;
+-	framework)
+-	  case $host in
+-	    *-*-darwin*)
+-	      case "$deplibs " in
+-		*" $qarg.ltframework "*) ;;
+-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+-		   ;;
+-	      esac
+-	      ;;
+-	  esac
+-	  prev=
+-	  continue
+-	  ;;
+ 	inst_prefix)
+ 	  inst_prefix_dir="$arg"
+ 	  prev=
+@@ -4452,11 +4439,6 @@ func_mode_link ()
+ 	continue
+ 	;;
+ 
+-      -framework)
+-	prev=framework
+-	continue
+-	;;
+-
+       -inst-prefix-dir)
+ 	prev=inst_prefix
+ 	continue
+@@ -5155,21 +5137,6 @@ func_mode_link ()
+ 	    fi
+ 	  fi
+ 	  ;; # -l
+-	*.ltframework)
+-	  if test "$linkmode,$pass" = "prog,link"; then
+-	    compile_deplibs="$deplib $compile_deplibs"
+-	    finalize_deplibs="$deplib $finalize_deplibs"
+-	  else
+-	    deplibs="$deplib $deplibs"
+-	    if test "$linkmode" = lib ; then
+-		case "$new_inherited_linker_flags " in
+-		    *" $deplib "*) ;;
+-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+-		esac
+-	    fi
+-	  fi
+-	  continue
+-	  ;;
+ 	-L*)
+ 	  case $linkmode in
+ 	  lib)
+@@ -5319,23 +5286,6 @@ func_mode_link ()
+ 	# Read the .la file
+ 	func_source "$lib"
+ 
+-	# Convert "-framework foo" to "foo.ltframework"
+-	if test -n "$inherited_linker_flags"; then
+-	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+-	    case " $new_inherited_linker_flags " in
+-	      *" $tmp_inherited_linker_flag "*) ;;
+-	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+-	    esac
+-	  done
+-	fi
+-	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	if test "$linkmode,$pass" = "lib,link" ||
+-	   test "$linkmode,$pass" = "prog,scan" ||
+-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+-	fi
+ 
+ 	if test "$pass" = conv; then
+ 	  # Only check for convenience libraries
diff --git a/package/pcmanfm/patches/patch-ltmain_sh.orig b/package/pcmanfm/patches/patch-ltmain_sh.orig
new file mode 100644
index 000000000..c80b629e8
--- /dev/null
+++ b/package/pcmanfm/patches/patch-ltmain_sh.orig
@@ -0,0 +1,34 @@
+--- pcmanfm-2.0.orig/ltmain.sh	2011-04-14 20:46:32.000000000 +0200
++++ pcmanfm-2.0/ltmain.sh	2011-04-16 11:59:52.000000000 +0200
+@@ -4216,19 +4216,6 @@ func_mode_link ()
+ 	  prev=
+ 	  continue
+ 	  ;;
+-	framework)
+-	  case $host in
+-	    *-*-darwin*)
+-	      case "$deplibs " in
+-		*" $qarg.ltframework "*) ;;
+-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+-		   ;;
+-	      esac
+-	      ;;
+-	  esac
+-	  prev=
+-	  continue
+-	  ;;
+ 	inst_prefix)
+ 	  inst_prefix_dir="$arg"
+ 	  prev=
+@@ -4452,11 +4439,6 @@ func_mode_link ()
+ 	continue
+ 	;;
+ 
+-      -framework)
+-	prev=framework
+-	continue
+-	;;
+-
+       -inst-prefix-dir)
+ 	prev=inst_prefix
+ 	continue
diff --git a/package/pcmanfm/patches/patch-src_Makefile_in b/package/pcmanfm/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..f7c2ff5ac
--- /dev/null
+++ b/package/pcmanfm/patches/patch-src_Makefile_in
@@ -0,0 +1,36 @@
+--- pcmanfm-2.0.orig/src/Makefile.in	2011-04-14 20:46:33.000000000 +0200
++++ pcmanfm-2.0/src/Makefile.in	2011-04-16 11:58:00.000000000 +0200
+@@ -67,8 +67,8 @@ am_xml_purge_OBJECTS = xml_purge-xml-pur
+ xml_purge_OBJECTS = $(am_xml_purge_OBJECTS)
+ xml_purge_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ xml_purge_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(xml_purge_CFLAGS) \
+-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++	$(LIBTOOLFLAGS) --mode=link $(CC_FOR_BUILD) \
++	$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -373,7 +373,7 @@ pcmanfm$(EXEEXT): $(pcmanfm_OBJECTS) $(p
+ 	$(pcmanfm_LINK) $(pcmanfm_OBJECTS) $(pcmanfm_LDADD) $(LIBS)
+ xml-purge$(EXEEXT): $(xml_purge_OBJECTS) $(xml_purge_DEPENDENCIES) 
+ 	@rm -f xml-purge$(EXEEXT)
+-	$(xml_purge_LINK) $(xml_purge_OBJECTS) $(xml_purge_LDADD) $(LIBS)
++	$(xml_purge_LINK) $(xml_purge_OBJECTS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -525,11 +525,11 @@ pcmanfm-single-inst.obj: single-inst.c
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcmanfm_CFLAGS) $(CFLAGS) -c -o pcmanfm-single-inst.obj `if test -f 'single-inst.c'; then $(CYGPATH_W) 'single-inst.c'; else $(CYGPATH_W) '$(srcdir)/single-inst.c'; fi`
+ 
+ xml_purge-xml-purge.o: xml-purge.c
+-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
++@am__fastdepCC_TRUE@	$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
+ @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xml-purge.c' object='xml_purge-xml-purge.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
++@am__fastdepCC_FALSE@	$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
+ 
+ xml_purge-xml-purge.obj: xml-purge.c
+ @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.obj -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.obj `if test -f 'xml-purge.c'; then $(CYGPATH_W) 'xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/xml-purge.c'; fi`