diff options
Diffstat (limited to 'x11-fm')
6 files changed, 26 insertions, 104 deletions
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index d5a922d63..bbbcf8abc 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -23,7 +23,7 @@ USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomedesktop eel2 \ librsvg2 GNOME_DESKTOP_VERSION=2 INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \ diff --git a/x11-fm/nautilus/files/patch-components-image_properties-nautilus-image-properties-view.c b/x11-fm/nautilus/files/patch-components-image_properties-nautilus-image-properties-view.c new file mode 100644 index 000000000..0f8441fab --- /dev/null +++ b/x11-fm/nautilus/files/patch-components-image_properties-nautilus-image-properties-view.c @@ -0,0 +1,12 @@ +--- components/image_properties/nautilus-image-properties-view.c.orig Thu Sep 30 15:41:33 2004 ++++ components/image_properties/nautilus-image-properties-view.c Thu Sep 30 15:43:11 2004 +@@ -130,7 +130,8 @@ + return; + } + +- attribute->value = g_strdup (exif_content_get_value (content, attribute->tag)); ++ char value[1024]; ++ attribute->value = g_strdup (exif_content_get_value (content, attribute->tag, value, sizeof(value))); + if (attribute->value != NULL) { + attribute->found = TRUE; + } diff --git a/x11-fm/nautilus/files/patch-ltmain.sh b/x11-fm/nautilus/files/patch-ltmain.sh deleted file mode 100644 index 3232b8da9..000000000 --- a/x11-fm/nautilus/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Sun Jan 11 17:28:53 2004 -+++ ltmain.sh Fri Jan 30 16:45:37 2004 -@@ -1280,7 +1280,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1290,8 +1290,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3000,6 +3008,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5428,10 +5439,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index d5a922d63..bbbcf8abc 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -23,7 +23,7 @@ USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomedesktop eel2 \ librsvg2 GNOME_DESKTOP_VERSION=2 INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \ diff --git a/x11-fm/nautilus2/files/patch-components-image_properties-nautilus-image-properties-view.c b/x11-fm/nautilus2/files/patch-components-image_properties-nautilus-image-properties-view.c new file mode 100644 index 000000000..0f8441fab --- /dev/null +++ b/x11-fm/nautilus2/files/patch-components-image_properties-nautilus-image-properties-view.c @@ -0,0 +1,12 @@ +--- components/image_properties/nautilus-image-properties-view.c.orig Thu Sep 30 15:41:33 2004 ++++ components/image_properties/nautilus-image-properties-view.c Thu Sep 30 15:43:11 2004 +@@ -130,7 +130,8 @@ + return; + } + +- attribute->value = g_strdup (exif_content_get_value (content, attribute->tag)); ++ char value[1024]; ++ attribute->value = g_strdup (exif_content_get_value (content, attribute->tag, value, sizeof(value))); + if (attribute->value != NULL) { + attribute->found = TRUE; + } diff --git a/x11-fm/nautilus2/files/patch-ltmain.sh b/x11-fm/nautilus2/files/patch-ltmain.sh deleted file mode 100644 index 3232b8da9..000000000 --- a/x11-fm/nautilus2/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Sun Jan 11 17:28:53 2004 -+++ ltmain.sh Fri Jan 30 16:45:37 2004 -@@ -1280,7 +1280,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1290,8 +1290,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3000,6 +3008,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5428,10 +5439,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" |