diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-14 18:47:53 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-14 18:47:53 +0200 |
commit | 476d4ff7d822e2e822dd6da36178c327fff59eba (patch) | |
tree | cad708fcfa7bbbe18d31c95ee80f433be9d426b5 /package/pcmanfm/patches | |
parent | 2aaa2425119172793847332d351c7a70590a87ed (diff) |
update to latest release, pcmanfm still segfaults
Diffstat (limited to 'package/pcmanfm/patches')
-rw-r--r-- | package/pcmanfm/patches/patch-ltmain_sh | 80 | ||||
-rw-r--r-- | package/pcmanfm/patches/patch-ltmain_sh.orig | 34 |
2 files changed, 0 insertions, 114 deletions
diff --git a/package/pcmanfm/patches/patch-ltmain_sh b/package/pcmanfm/patches/patch-ltmain_sh deleted file mode 100644 index 207a1b457..000000000 --- a/package/pcmanfm/patches/patch-ltmain_sh +++ /dev/null @@ -1,80 +0,0 @@ ---- 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 deleted file mode 100644 index c80b629e8..000000000 --- a/package/pcmanfm/patches/patch-ltmain_sh.orig +++ /dev/null @@ -1,34 +0,0 @@ ---- 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 |