- Update to Thunar 0.9.0

- fix WANTLIB and bump SHARED_LIBS version
- remove my merged patch fixing SIGBUS on sparc64
- install generated gtk-doc
- add update-desktop-database goo

ok ajacoutot@ steven@
This commit is contained in:
landry 2007-12-18 20:37:41 +00:00
parent a8f87ee964
commit 0cbde580f2
4 changed files with 157 additions and 159 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.6 2007/09/15 20:04:26 merdely Exp $
# $OpenBSD: Makefile,v 1.7 2007/12/18 20:37:41 landry Exp $
COMMENT= lightweight file manager for xfce4
V= 0.8.0
V= 0.9.0
DISTNAME= Thunar-${V}
PKGNAME= thunar-${V}p2
PKGNAME= thunar-${V}
SHARED_LIBS += thunarx-1 4.2 # .4.2
SHARED_LIBS += thunar-vfs-1 4.2 # .4.2
SHARED_LIBS= thunarx-1 5.1 \
thunar-vfs-1 5.1
HOMEPAGE= http://thunar.xfce.org/
MAINTAINER= Landry Breuil <gaston@gcu.info>
@ -30,16 +30,17 @@ CONFIGURE_ARGS= --disable-gnome-thumbnailers \
--enable-pcre
LIB_DEPENDS= exo-0.3.>=4::x11/xfce4/exo \
pcre.>=1.0::devel/pcre \
pcre.>=2.0::devel/pcre \
xfce4panel.>=2.2::x11/xfce4/xfce4-panel \
exif.>=12.1::graphics/libexif \
dbus-glib-1::x11/dbus-glib \
dbus-1.>=6::x11/dbus
RUN_DEPENDS= ::x11/xfce4/xfce4-icon-theme
RUN_DEPENDS= ::devel/desktop-file-utils \
::x11/xfce4/xfce4-icon-theme
WANTLIB= ICE SM X11 Xau Xdmcp Xrender atk-1.0 c cairo expat \
Xcursor Xext Xfixes Xi Xinerama Xrandr fontconfig \
WANTLIB= ICE SM X11 Xau Xdmcp Xrender Xdamage atk-1.0 c cairo expat \
Xcursor Xext Xfixes Xi Xinerama Xrandr Xcomposite fontconfig \
freetype gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 \
gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 \
m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread \

View File

@ -1,5 +1,5 @@
MD5 (xfce4/Thunar-0.8.0.tar.bz2) = 9f7b0945d6a235391049f6818fb4d188
RMD160 (xfce4/Thunar-0.8.0.tar.bz2) = 95d29cca64c102b7d8bdcc0592f6fcab7198148b
SHA1 (xfce4/Thunar-0.8.0.tar.bz2) = 1adcba7b86d9219b0bd7eb8c16d5719aa8393d98
SHA256 (xfce4/Thunar-0.8.0.tar.bz2) = 460484f8397a0e0e4115d1629d2ae027b5052dc2c564d4a4629a3557e4a055f9
SIZE (xfce4/Thunar-0.8.0.tar.bz2) = 6205993
MD5 (xfce4/Thunar-0.9.0.tar.bz2) = D8UAiFhmHAq9A5msvjDvKA==
RMD160 (xfce4/Thunar-0.9.0.tar.bz2) = 67dEqhB9Te8GyMgF7mk20azy1Nc=
SHA1 (xfce4/Thunar-0.9.0.tar.bz2) = /UYl1Y4oAGCH1aNQBEg6lTGE5P4=
SHA256 (xfce4/Thunar-0.9.0.tar.bz2) = JsgzsL3zKBxh4D8fuYX+ztiM9KXOvOe9BV8F4CVGADc=
SIZE (xfce4/Thunar-0.9.0.tar.bz2) = 6403785

View File

@ -1,144 +0,0 @@
$OpenBSD: patch-thunar-vfs_thunar-vfs-path_c,v 1.2 2007/05/22 15:37:37 steven Exp $
--- thunar-vfs/thunar-vfs-path.c.orig Sat Jan 20 21:39:09 2007
+++ thunar-vfs/thunar-vfs-path.c Mon May 21 18:45:55 2007
@@ -46,11 +46,11 @@
/* Masks to handle the 4-byte aligned path names */
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define THUNAR_VFS_PATH_MASK (0xffu << ((sizeof (guint) - 1) * 8))
+#define THUNAR_VFS_PATH_MASK (0xffu << ((sizeof (gsize) - 1) * 8))
#define THUNAR_VFS_PATH_ROOT (0x2fu)
#elif G_BYTE_ORDER == G_BIG_ENDIAN
#define THUNAR_VFS_PATH_MASK (0xffu)
-#define THUNAR_VFS_PATH_ROOT (0x2fu << ((sizeof (guint) - 1) * 8))
+#define THUNAR_VFS_PATH_ROOT (0x2fu << ((sizeof (gsize) - 1) * 8))
#else
#error "Unsupported endianess"
#endif
@@ -484,7 +484,7 @@ void
thunar_vfs_path_unref (ThunarVfsPath *path)
{
ThunarVfsPath *parent;
- const guint *p;
+ const gsize *p;
while (path != NULL && (g_atomic_int_exchange_and_add (&path->ref_count, -1) & ~THUNAR_VFS_PATH_SCHEME_MASK) == 1)
{
@@ -519,7 +519,7 @@ thunar_vfs_path_unref (ThunarVfsPath *path)
THUNAR_VFS_PATH_DEBUG_REMOVE (path);
/* release the path resources (we need to determine the size for the slice allocator) */
- for (p = (const guint *) thunar_vfs_path_get_name (path); (*p & THUNAR_VFS_PATH_MASK) != 0u; ++p)
+ for (p = (const gsize *) thunar_vfs_path_get_name (path); (*p & THUNAR_VFS_PATH_MASK) != 0u; ++p)
;
_thunar_vfs_slice_free1 (((const guint8 *) (p + 1)) - ((const guint8 *) path), path);
@@ -570,8 +570,8 @@ thunar_vfs_path_equal (gconstpointer path_ptr_a,
{
const ThunarVfsPath *path_a = path_ptr_a;
const ThunarVfsPath *path_b = path_ptr_b;
- const guint *a;
- const guint *b;
+ const gsize *a;
+ const gsize *b;
/* compare the schemes */
if (thunar_vfs_path_get_scheme (path_a) != thunar_vfs_path_get_scheme (path_b))
@@ -583,8 +583,8 @@ again:
return TRUE;
/* compare the last path component */
- a = (const guint *) thunar_vfs_path_get_name (path_a);
- b = (const guint *) thunar_vfs_path_get_name (path_b);
+ a = (const gsize *) thunar_vfs_path_get_name (path_a);
+ b = (const gsize *) thunar_vfs_path_get_name (path_b);
for (;;)
{
if (*a != *b)
@@ -1120,7 +1120,7 @@ _thunar_vfs_path_init (void)
_thunar_vfs_return_if_fail (n_home_components == 0);
/* include the root element */
- n_bytes = sizeof (ThunarVfsPath) + sizeof (guint);
+ n_bytes = sizeof (ThunarVfsPath) + sizeof (gsize);
n_home_components = 1;
/* split the home path into its components */
@@ -1128,7 +1128,7 @@ _thunar_vfs_path_init (void)
for (component = components; *component != NULL; ++component)
if (G_LIKELY (**component != '\0'))
{
- n_bytes += sizeof (ThunarVfsPath) + ((strlen (*component) + sizeof (guint)) / sizeof (guint)) * sizeof (guint);
+ n_bytes += sizeof (ThunarVfsPath) + ((strlen (*component) + sizeof (gsize)) / sizeof (gsize)) * sizeof (gsize);
n_home_components += 1;
}
@@ -1141,8 +1141,8 @@ _thunar_vfs_path_init (void)
path->ref_count = 1;
path->parent = NULL;
home_components[0] = path;
- *((guint *) thunar_vfs_path_get_name (path)) = THUNAR_VFS_PATH_ROOT;
- offset += sizeof (ThunarVfsPath) + sizeof (guint);
+ *((gsize *) thunar_vfs_path_get_name (path)) = THUNAR_VFS_PATH_ROOT;
+ offset += sizeof (ThunarVfsPath) + sizeof (gsize);
/* add the remaining path components */
for (component = components; *component != NULL; ++component)
@@ -1155,7 +1155,7 @@ _thunar_vfs_path_init (void)
home_components[++n] = path;
/* calculate the offset for the next home path component */
- offset += sizeof (ThunarVfsPath) + ((strlen (*component) + sizeof (guint)) / sizeof (guint)) * sizeof (guint);
+ offset += sizeof (ThunarVfsPath) + ((strlen (*component) + sizeof (gsize)) / sizeof (gsize)) * sizeof (gsize);
/* copy the path */
for (s = *component, t = (gchar *) thunar_vfs_path_get_name (path); *s != '\0'; )
@@ -1170,10 +1170,10 @@ _thunar_vfs_path_init (void)
g_assert (n_home_components == n + 1);
/* allocate the trash root path */
- _thunar_vfs_path_trash_root = g_malloc (sizeof (ThunarVfsPath) + sizeof (guint));
+ _thunar_vfs_path_trash_root = g_malloc (sizeof (ThunarVfsPath) + sizeof (gsize));
_thunar_vfs_path_trash_root->ref_count = 1 | THUNAR_VFS_PATH_SCHEME_TRASH;
_thunar_vfs_path_trash_root->parent = NULL;
- *((guint *) thunar_vfs_path_get_name (_thunar_vfs_path_trash_root)) = THUNAR_VFS_PATH_ROOT;
+ *((gsize *) thunar_vfs_path_get_name (_thunar_vfs_path_trash_root)) = THUNAR_VFS_PATH_ROOT;
/* cleanup */
g_strfreev (components);
@@ -1252,7 +1252,7 @@ _thunar_vfs_path_new_relative (ThunarVfsPath *parent,
/* determine the length of the path component in bytes */
for (s1 = s + 1; *s1 != '\0' && *s1 != G_DIR_SEPARATOR; ++s1)
;
- n = (((s1 - s) + sizeof (guint)) / sizeof (guint)) * sizeof (guint)
+ n = (((s1 - s) + sizeof (gsize)) / sizeof (gsize)) * sizeof (gsize)
+ sizeof (ThunarVfsPath);
/* allocate memory for the new path component */
@@ -1264,7 +1264,7 @@ _thunar_vfs_path_new_relative (ThunarVfsPath *parent,
THUNAR_VFS_PATH_DEBUG_INSERT (path);
/* zero out the last word to have the name zero-terminated */
- *(((guint *) (((gchar *) path) + n)) - 1) = 0;
+ *(((gsize *) (((gchar *) path) + n)) - 1) = 0;
/* copy the path component name */
for (t = (gchar *) thunar_vfs_path_get_name (path); *s != '\0' && *s != G_DIR_SEPARATOR; )
@@ -1325,7 +1325,7 @@ _thunar_vfs_path_child (ThunarVfsPath *parent,
/* determine the length of the name in bytes */
for (s = name + 1; *s != '\0'; ++s)
;
- n = (((s - name) + sizeof (guint)) / sizeof (guint)) * sizeof (guint)
+ n = (((s - name) + sizeof (gsize)) / sizeof (gsize)) * sizeof (gsize)
+ sizeof (ThunarVfsPath);
/* allocate memory for the new path component */
@@ -1337,7 +1337,7 @@ _thunar_vfs_path_child (ThunarVfsPath *parent,
THUNAR_VFS_PATH_DEBUG_INSERT (path);
/* zero out the last word to have the name zero-terminated */
- *(((guint *) (((gchar *) path) + n)) - 1) = 0;
+ *(((gsize *) (((gchar *) path) + n)) - 1) = 0;
/* copy the path component name */
for (s = name, t = (gchar *) thunar_vfs_path_get_name (path); *s != '\0'; )

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2007/05/28 19:53:07 steven Exp $
@comment $OpenBSD: PLIST,v 1.4 2007/12/18 20:37:41 landry Exp $
@conflict xffm-*
%%SHARED%%
bin/Thunar
@ -40,6 +40,7 @@ lib/libthunar-vfs-1.a
lib/libthunar-vfs-1.la
lib/libthunarx-1.a
lib/libthunarx-1.la
lib/pkgconfig/
lib/pkgconfig/thunar-vfs-1.pc
lib/pkgconfig/thunarx-1.pc
lib/thunarx-1/
@ -63,6 +64,7 @@ libexec/xfce4/panel-plugins/thunar-tpa
share/Thunar/
share/Thunar/sendto/
share/Thunar/sendto/thunar-sendto-email.desktop
share/applications/
share/applications/Thunar-bulk-rename.desktop
share/applications/Thunar-folder-handler.desktop
share/applications/Thunar.desktop
@ -191,6 +193,29 @@ share/doc/Thunar/html/ja/support.html
share/doc/Thunar/html/ja/the-file-manager-window.html
share/doc/Thunar/html/ja/using-removable-media.html
share/doc/Thunar/html/ja/working-with-files-and-folders.html
share/doc/Thunar/html/nl/
share/doc/Thunar/html/nl/advanced-topics.html
share/doc/Thunar/html/nl/copyright.html
share/doc/Thunar/html/nl/customizing-thunar.html
share/doc/Thunar/html/nl/faq.html
share/doc/Thunar/html/nl/images/
share/doc/Thunar/html/nl/images/bulk-rename.png
share/doc/Thunar/html/nl/images/file-manager-window.png
share/doc/Thunar/html/nl/images/file-properties.png
share/doc/Thunar/html/nl/images/preferences-advanced.png
share/doc/Thunar/html/nl/images/preferences-behavior.png
share/doc/Thunar/html/nl/images/preferences-side-pane.png
share/doc/Thunar/html/nl/images/preferences-views.png
share/doc/Thunar/html/nl/images/removable-drives-and-media.png
share/doc/Thunar/html/nl/images/removable-media-unmount.png
share/doc/Thunar/html/nl/images/sendto-menu.png
share/doc/Thunar/html/nl/images/visible-columns.png
share/doc/Thunar/html/nl/index.html
share/doc/Thunar/html/nl/preferences.html
share/doc/Thunar/html/nl/support.html
share/doc/Thunar/html/nl/the-file-manager-window.html
share/doc/Thunar/html/nl/using-removable-media.html
share/doc/Thunar/html/nl/working-with-files-and-folders.html
share/doc/Thunar/html/pl/
share/doc/Thunar/html/pl/advanced-topics.html
share/doc/Thunar/html/pl/copyright.html
@ -265,25 +290,113 @@ share/examples/Thunar/
@sample ${SYSCONFDIR}/xdg/Thunar/
share/examples/Thunar/uca.xml
@sample ${SYSCONFDIR}/xdg/Thunar/uca.xml
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/thunar-vfs/
share/gtk-doc/html/thunar-vfs/ThunarVfsGroup.html
share/gtk-doc/html/thunar-vfs/ThunarVfsJob.html
share/gtk-doc/html/thunar-vfs/ThunarVfsMimeAction.html
share/gtk-doc/html/thunar-vfs/ThunarVfsMimeApplication.html
share/gtk-doc/html/thunar-vfs/ThunarVfsMimeDatabase.html
share/gtk-doc/html/thunar-vfs/ThunarVfsMimeHandler.html
share/gtk-doc/html/thunar-vfs/ThunarVfsMonitor.html
share/gtk-doc/html/thunar-vfs/ThunarVfsUser.html
share/gtk-doc/html/thunar-vfs/ThunarVfsUserManager.html
share/gtk-doc/html/thunar-vfs/ThunarVfsVolume.html
share/gtk-doc/html/thunar-vfs/ThunarVfsVolumeManager.html
share/gtk-doc/html/thunar-vfs/filesystem-monitoring.html
share/gtk-doc/html/thunar-vfs/fundamentals.html
share/gtk-doc/html/thunar-vfs/home.png
share/gtk-doc/html/thunar-vfs/index.html
share/gtk-doc/html/thunar-vfs/index.sgml
share/gtk-doc/html/thunar-vfs/introduction.html
share/gtk-doc/html/thunar-vfs/ix01.html
share/gtk-doc/html/thunar-vfs/jobs.html
share/gtk-doc/html/thunar-vfs/left.png
share/gtk-doc/html/thunar-vfs/mime-types.html
share/gtk-doc/html/thunar-vfs/right.png
share/gtk-doc/html/thunar-vfs/style.css
share/gtk-doc/html/thunar-vfs/thunar-vfs-Basic-Types.html
share/gtk-doc/html/thunar-vfs/thunar-vfs-Initialization-and-Shutdown.html
share/gtk-doc/html/thunar-vfs/thunar-vfs-Jobs.html
share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsInfo.html
share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsMimeInfo.html
share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsPath.html
share/gtk-doc/html/thunar-vfs/thunar-vfs-Utility-Functions.html
share/gtk-doc/html/thunar-vfs/thunar-vfs.devhelp
share/gtk-doc/html/thunar-vfs/thunar-vfs.devhelp2
share/gtk-doc/html/thunar-vfs/up.png
share/gtk-doc/html/thunar-vfs/users-and-groups-handling.html
share/gtk-doc/html/thunar-vfs/volume-handling.html
share/gtk-doc/html/thunarx/
share/gtk-doc/html/thunarx/ThunarxFileInfo.html
share/gtk-doc/html/thunarx/ThunarxMenuProvider.html
share/gtk-doc/html/thunarx/ThunarxPreferencesProvider.html
share/gtk-doc/html/thunarx/ThunarxPropertyPage.html
share/gtk-doc/html/thunarx/ThunarxPropertyPageProvider.html
share/gtk-doc/html/thunarx/ThunarxProviderFactory.html
share/gtk-doc/html/thunarx/ThunarxProviderPlugin.html
share/gtk-doc/html/thunarx/ThunarxRenamer.html
share/gtk-doc/html/thunarx/ThunarxRenamerProvider.html
share/gtk-doc/html/thunarx/abstraction.png
share/gtk-doc/html/thunarx/bulk-rename.png
share/gtk-doc/html/thunarx/home.png
share/gtk-doc/html/thunarx/index.html
share/gtk-doc/html/thunarx/index.sgml
share/gtk-doc/html/thunarx/ix01.html
share/gtk-doc/html/thunarx/left.png
share/gtk-doc/html/thunarx/menu-provider.png
share/gtk-doc/html/thunarx/right.png
share/gtk-doc/html/thunarx/say-hello.png
share/gtk-doc/html/thunarx/style.css
share/gtk-doc/html/thunarx/thunarx-Variables-and-functions-to-check-the-library-version.html
share/gtk-doc/html/thunarx/thunarx-abstraction-layer.html
share/gtk-doc/html/thunarx/thunarx-fundamentals.html
share/gtk-doc/html/thunarx/thunarx-overview.html
share/gtk-doc/html/thunarx/thunarx-providers.html
share/gtk-doc/html/thunarx/thunarx-using-extensions.html
share/gtk-doc/html/thunarx/thunarx-writing-extensions-advanced-topics.html
share/gtk-doc/html/thunarx/thunarx-writing-extensions-getting-started.html
share/gtk-doc/html/thunarx/thunarx-writing-extensions.html
share/gtk-doc/html/thunarx/thunarx.devhelp
share/gtk-doc/html/thunarx/thunarx.devhelp2
share/gtk-doc/html/thunarx/up.png
share/icons/hicolor/
share/icons/hicolor/16x16/
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/Thunar.png
share/icons/hicolor/16x16/stock/
share/icons/hicolor/16x16/stock/navigation/
share/icons/hicolor/16x16/stock/navigation/stock_thunar-shortcuts.png
share/icons/hicolor/16x16/stock/navigation/stock_thunar-templates.png
share/icons/hicolor/24x24/
share/icons/hicolor/24x24/apps/
share/icons/hicolor/24x24/apps/Thunar.png
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/Thunar.png
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/Thunar.svg
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/Thunar.mo
share/locale/be/LC_MESSAGES/Thunar.mo
share/locale/ca/LC_MESSAGES/Thunar.mo
share/locale/cs/LC_MESSAGES/Thunar.mo
share/locale/de/LC_MESSAGES/Thunar.mo
share/locale/dz/
share/locale/dz/LC_MESSAGES/
share/locale/dz/LC_MESSAGES/Thunar.mo
share/locale/el/LC_MESSAGES/Thunar.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/Thunar.mo
share/locale/eo/LC_MESSAGES/Thunar.mo
share/locale/es/LC_MESSAGES/Thunar.mo
share/locale/et/LC_MESSAGES/Thunar.mo
share/locale/eu/
share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/Thunar.mo
share/locale/fi/LC_MESSAGES/Thunar.mo
share/locale/fr/LC_MESSAGES/Thunar.mo
@ -292,24 +405,52 @@ share/locale/he/LC_MESSAGES/Thunar.mo
share/locale/hu/LC_MESSAGES/Thunar.mo
share/locale/it/LC_MESSAGES/Thunar.mo
share/locale/ja/LC_MESSAGES/Thunar.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/Thunar.mo
share/locale/ko/LC_MESSAGES/Thunar.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/Thunar.mo
share/locale/lv/LC_MESSAGES/Thunar.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/Thunar.mo
share/locale/nb_NO/
share/locale/nb_NO/LC_MESSAGES/
share/locale/nb_NO/LC_MESSAGES/Thunar.mo
share/locale/nl/LC_MESSAGES/Thunar.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/Thunar.mo
share/locale/pl/LC_MESSAGES/Thunar.mo
share/locale/pt_BR/LC_MESSAGES/Thunar.mo
share/locale/pt_PT/
share/locale/pt_PT/LC_MESSAGES/
share/locale/pt_PT/LC_MESSAGES/Thunar.mo
share/locale/ro/LC_MESSAGES/Thunar.mo
share/locale/ru/LC_MESSAGES/Thunar.mo
share/locale/sk/LC_MESSAGES/Thunar.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/Thunar.mo
share/locale/sv/LC_MESSAGES/Thunar.mo
share/locale/tr/LC_MESSAGES/Thunar.mo
share/locale/uk/LC_MESSAGES/Thunar.mo
share/locale/ur/
share/locale/ur/LC_MESSAGES/
share/locale/ur/LC_MESSAGES/Thunar.mo
share/locale/zh_CN/LC_MESSAGES/Thunar.mo
share/locale/zh_TW/LC_MESSAGES/Thunar.mo
share/pixmaps/
share/pixmaps/Thunar/
share/pixmaps/Thunar/Thunar-about-logo.png
share/pixmaps/Thunar/Thunar-fallback-icon.png
share/thumbnailers/
share/thumbnailers/thunar-vfs-font-thumbnailer-1.desktop
share/xfce4/panel-plugins/
share/xfce4/panel-plugins/thunar-tpa.desktop
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor
@exec %D/bin/update-desktop-database
@unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor
@unexec %D/bin/update-desktop-database