2010-08-30 Brian Cameron <
[email protected]>
* SFEpcmanfm.spec, patches/pcmanfm-01-Wall.diff,
patches/pcmanfm-02-inline.diff: Bump to 0.9.7 and add patches
needed for building.
* patches/pcmanfm-01-mnttab.diff, patches/pcmanfm-02-Werror.diff,
patches/pcmanfm-03-union-struct-naming.diff: Remove upstream
patches.
* SFElibfm.spec, patches/libfm-01-studio.diff,
patches/libfm-02-inline.diff: Add new spec file with version
0.1.12.
* SFEimlib2.spec: Bump to 1.4.4.
* SFEenlightenment.spec: Bump to 1.0.4.
* SFEethos.spec: Add BuildRequires on vala.
* SFEpywebkitgtk.spec: Remove .la/.a files.
* base-specs/boost.spec, patches/boost-06-bjam-math.diff: Bump to
1.44.
* base-specs/liblouis.spec: Bump to 2.1.1.
--- a/ChangeLog Fri Aug 27 03:41:37 2010 +0000
+++ b/ChangeLog Mon Aug 30 07:25:50 2010 +0000
@@ -1,3 +1,22 @@
+2010-08-30 Brian Cameron <[email protected]>
+
+ * SFEpcmanfm.spec, patches/pcmanfm-01-Wall.diff,
+ patches/pcmanfm-02-inline.diff: Bump to 0.9.7 and add patches
+ needed for building.
+ * patches/pcmanfm-01-mnttab.diff, patches/pcmanfm-02-Werror.diff,
+ patches/pcmanfm-03-union-struct-naming.diff: Remove upstream
+ patches.
+ * SFElibfm.spec, patches/libfm-01-studio.diff,
+ patches/libfm-02-inline.diff: Add new spec file with version
+ 0.1.12.
+ * SFEimlib2.spec: Bump to 1.4.4.
+ * SFEenlightenment.spec: Bump to 1.0.4.
+ * SFEethos.spec: Add BuildRequires on vala.
+ * SFEpywebkitgtk.spec: Remove .la/.a files.
+ * base-specs/boost.spec, patches/boost-06-bjam-math.diff: Bump to
+ 1.44.
+ * base-specs/liblouis.spec: Bump to 2.1.1.
+
2010-08-26 Brian Cameron <[email protected]>
* SFElightdm.spec, patches/lightdm-01-branding.diff,
--- a/SFEenlightenment.spec Fri Aug 27 03:41:37 2010 +0000
+++ b/SFEenlightenment.spec Mon Aug 30 07:25:50 2010 +0000
@@ -11,7 +11,7 @@
# Software specific variable definitions
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
%define src_name e16-1
-%define src_version 0.2
+%define src_version 0.4
%define pkg_release 1
# %{_topdir} is by default set to RPM_BUILD_ROOT
# Default path for RPM_BUILD_ROOT is /var/tmp/pkgbuild-{username}
@@ -121,6 +121,8 @@
%{_mandir}/man1/*
%changelog
+* Thu Aug 26 2010 - [email protected]
+- Bump to 1.0.4.
* Wed Mar 10 2010 - [email protected]
- Bump to 1.0.2.
* Thu Sep 24 2009 - [email protected]
--- a/SFEethos.spec Fri Aug 27 03:41:37 2010 +0000
+++ b/SFEethos.spec Mon Aug 30 07:25:50 2010 +0000
@@ -24,14 +24,14 @@
Requires: SUNWgtk2
Requires: SUNWdbus-glib
Requires: SUNWgnome-python26-libs
+Requires: SUNWvala
Requires: SFEgjs
-Requires: SFEvala
BuildRequires: SUNWglib2-devel
BuildRequires: SUNWgtk2-devel
BuildRequires: SUNWdbus-glib-devel
BuildRequires: SUNWgnome-python26-libs-devel
+BuildRequires: SUNWvala-devel
BuildRequires: SFEgjs-devel
-BuildRequires: SFEvala-devel
%package devel
Summary: %{summary} - development files
--- a/SFEimlib2.spec Fri Aug 27 03:41:37 2010 +0000
+++ b/SFEimlib2.spec Mon Aug 30 07:25:50 2010 +0000
@@ -7,7 +7,7 @@
Name: SFEimlib2
Summary: general Image loading and rendering library
-Version: 1.4.2
+Version: 1.4.4
Source: %{sf_download}/enlightenment/imlib2-%{version}.tar.gz
SUNW_BaseDir: %{_basedir}
@@ -72,6 +72,8 @@
%{_datadir}/*
%changelog
+* Thu Aug 26 2010 - [email protected]
+- Bump to 1.4.4.
* Mon Jan 05 2008 - [email protected]
- Bump to 1.4.2.
* Thu Nov 15 2007 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFElibfm.spec Mon Aug 30 07:25:50 2010 +0000
@@ -0,0 +1,129 @@
+#
+# spec file for package SFElibfm
+#
+# includes module(s): libfm
+#
+# https://sourceforge.net/tracker/index.php?func=detail&aid=$bugid&group_id=156956&atid=801864
+#
+%include Solaris.inc
+
+Name: SFElibfm
+Summary: LXDE lightweight file manager library
+Version: 0.1.12
+Source: http://downloads.sourceforge.net/pcmanfm/libfm-%{version}.tar.gz
+Patch1: libfm-01-studio.diff
+Patch2: libfm-02-inline.diff
+URL: http://sourceforge.net/projects/pcmanfm/
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+Requires: SFEmenu-cache
+BuildRequires: SFEmenu-cache
+
+%package root
+Summary: %{summary} - / filesystem
+SUNW_BaseDir: /
+%include default-depend.inc
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+
+%if %build_l10n
+%package l10n
+Summary: %{summary} - l10n files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %{name}
+%endif
+
+%prep
+%setup -q -n libfm-%version
+%patch1 -p1
+%patch2 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+export LDFLAGS="-lsocket"
+
+export GMSGFMT=/usr/bin/gmsgfmt
+libtoolize --force
+aclocal $ACLOCAL_FLAGS
+autoheader
+automake -a -c -f
+autoconf
+./configure \
+ --prefix=%{_prefix} \
+ --libdir=%{_libdir} \
+ --sysconfdir=%{_sysconfdir} \
+ --localstatedir=%{_localstatedir}
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.a" -exec rm -f {} ';'
+
+%if %build_l10n
+%else
+# REMOVE l10n FILES
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755,root,bin) %{_libdir}
+%{_libdir}/lib*.so*
+%{_libdir}/libfm
+%{_libdir}/gio
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/applications
+%{_datadir}/applications/*
+%{_datadir}/libfm/*
+%dir %attr (0755, root, root) %{_datadir}/mime
+%dir %attr (0755, root, root) %{_datadir}/mime/*
+%{_datadir}/mime/*/*
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %dir %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+%dir %attr (0755, root, bin) %dir %{_includedir}
+%{_includedir}/*
+
+%files root
+%defattr (-, root, sys)
+%dir %attr (0755, root, sys) %{_sysconfdir}
+%dir %attr (0755, root, sys) %{_sysconfdir}/xdg
+%dir %attr (0755, root, sys) %{_sysconfdir}/xdg/libfm
+%{_sysconfdir}/xdg/libfm/*
+
+%if %build_l10n
+%files l10n
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_datadir}
+%attr (-, root, other) %{_datadir}/locale
+%endif
+
+%changelog
+* Tue Aug 04 2009 - [email protected]
+- Bump to 0.5.1
+* Mon May 25 2009 - [email protected]
+- Update source URL and set correct GMSGFMT.
+* Mon Mar 16 2009 - [email protected]
+- Initial version
--- a/SFEpcmanfm.spec Fri Aug 27 03:41:37 2010 +0000
+++ b/SFEpcmanfm.spec Mon Aug 30 07:25:50 2010 +0000
@@ -9,23 +9,18 @@
Name: SFEpcmanfm
Summary: LXDE lightweight file manager
-Version: 0.5.1
-Source: http://downloads.sourceforge.net/pcmanfm/pcmanfm-%{version}.tar.bz2
+Version: 0.9.7
+Source: http://downloads.sourceforge.net/pcmanfm/pcmanfm-%{version}.tar.gz
+Patch1: pcmanfm-01-Wall.diff
+Patch2: pcmanfm-02-inline.diff
URL: http://sourceforge.net/projects/pcmanfm/
-
-# owner:alfred date:2009-03-16 type:bug bugid:2688199
-Patch1: pcmanfm-01-mnttab.diff
-
-# owner:alfred date:2009-03-16 type:bug
-Patch2: pcmanfm-02-Werror.diff
-
-# owner:alfred date:2009-03-16 type:bug
-Patch3: pcmanfm-03-union-struct-naming.diff
-
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
+Requires: SFElibfm
+BuildRequires: SFElibfm-devel
+
%if %build_l10n
%package l10n
Summary: %{summary} - l10n files
@@ -38,7 +33,6 @@
%setup -q -n pcmanfm-%version
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -49,6 +43,10 @@
export LDFLAGS="-lsocket"
export GMSGFMT=/usr/bin/gmsgfmt
+libtoolize --force
+aclocal $ACLOCAL_FLAGS
+autoheader
+automake -a -c -f
autoconf
./configure --prefix=%{_prefix} --libdir=%{_libdir}
make -j$CPUS
@@ -73,11 +71,6 @@
%dir %attr (0755, root, sys) %{_datadir}
%dir %attr (0755, root, other) %{_datadir}/applications
%{_datadir}/applications/*
-%dir %attr (0755, root, other) %{_datadir}/pixmaps
-%{_datadir}/pixmaps/*
-%dir %attr (0755, root, root) %{_datadir}/mime
-%dir %attr (0755, root, root) %{_datadir}/mime/*
-%{_datadir}/mime/*/*
%dir %attr (0755, root, other) %{_datadir}/pcmanfm
%{_datadir}/pcmanfm/*
--- a/SFEpywebkitgtk.spec Fri Aug 27 03:41:37 2010 +0000
+++ b/SFEpywebkitgtk.spec Mon Aug 30 07:25:50 2010 +0000
@@ -42,7 +42,8 @@
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT \( -name \*.la -o -name \*.a \) -exec rm {} \;
+find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.a" -exec rm -f {} ';'
%clean
rm -rf $RPM_BUILD_ROOT
--- a/base-specs/boost.spec Fri Aug 27 03:41:37 2010 +0000
+++ b/base-specs/boost.spec Mon Aug 30 07:25:50 2010 +0000
@@ -9,7 +9,7 @@
#
%define major 1
-%define minor 43
+%define minor 44
%define patchlevel 0
%define ver_boost %{major}_%{minor}_%{patchlevel}
@@ -31,6 +31,7 @@
# date:2009-11-04 owner:sobi
Patch3: boost-03-xmlparser.diff
Patch4: boost-04-compiler.diff
+Patch6: boost-06-bjam-math.diff
URL: http://www.boost.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -41,6 +42,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch6 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -107,6 +109,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Aug 26 2010 - Brian Cameron <[email protected]
+- Bump to 1.44.
* Wed Aug 04 2010 - Brian Cameron <[email protected]>
- Bump to 1.43.
* Fri Mar 05 2010 - Brian Cameron <[email protected]>
--- a/base-specs/liblouis.spec Fri Aug 27 03:41:37 2010 +0000
+++ b/base-specs/liblouis.spec Mon Aug 30 07:25:50 2010 +0000
@@ -3,7 +3,7 @@
# package are under the same license as the package itself.
Summary: Support for contracted braille
Name: liblouis
-Version: 1.8.0
+Version: 2.1.1
License: GPL V3
Group: Libraries
Source: http://liblouis.googlecode.com/files/%{name}-%{version}.tar.gz
@@ -48,6 +48,8 @@
%{_libdir}/python?.?/vendor-packages/louis/*
%changelog
+* Mon Aug 30 2010 - Brian Cameron
+- Bump to 2.1.1.
* Thu Apr 01 2010 - Brian Cameron
- Update to 1.8.0.
* Mon Jan 11 2010 - Willie Walker
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boost-06-bjam-math.diff Mon Aug 30 07:25:50 2010 +0000
@@ -0,0 +1,11 @@
+--- boost_1_44_0/libs/math/build/Jamfile.v2-orig 2010-08-27 00:09:53.218095667 -0500
++++ boost_1_44_0/libs/math/build/Jamfile.v2 2010-08-27 00:12:34.284872207 -0500
+@@ -13,7 +13,7 @@ project
+ #<toolset>intel-linux:<pch>off
+ <toolset>intel-darwin:<pch>off
+ <toolset>msvc-7.1:<pch>off
+- <toolset>gcc:<cxxflags>-fvisibility=hidden
++ #<toolset>gcc:<cxxflags>-fvisibility=hidden
+ <toolset>intel-linux:<cxxflags>-fvisibility=hidden
+ <toolset>sun:<cxxflags>-xldscope=hidden
+ ;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libfm-01-studio.diff Mon Aug 30 07:25:50 2010 +0000
@@ -0,0 +1,55 @@
+--- libfm-0.1.12/configure.ac-orig 2010-08-27 00:22:58.277160931 -0500
++++ libfm-0.1.12/configure.ac 2010-08-27 00:23:21.588493826 -0500
+@@ -3,7 +3,7 @@
+
+ AC_PREREQ([2.63])
+ AC_INIT([libfm], [0.1.12], [http://libfm.sf.net/])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE()
+
+ AC_CONFIG_HEADERS([config.h])
+
+--- libfm-0.1.12/src/Makefile.am-orig 2010-08-27 00:38:47.380412379 -0500
++++ libfm-0.1.12/src/Makefile.am 2010-08-27 00:38:59.923612592 -0500
+@@ -153,7 +153,6 @@ libfm_la_SOURCES = \
+ libfm_la_CFLAGS = \
+ $(GIO_CFLAGS) \
+ $(MENU_CACHE_CFLAGS) \
+- -Werror-implicit-function-declaration \
+ $(NULL)
+
+ libfm_la_LIBADD = \
+@@ -178,8 +177,7 @@ libfm_gtk_la_CFLAGS = \
+ $(MENU_CACHE_CFLAGS) \
+ -I$(srcdir) \
+ -I$(srcdir)/base \
+- -I$(srcdir)/job \
+- -Werror-implicit-function-declaration
++ -I$(srcdir)/job
+
+ libfm_gtk_la_LIBADD = \
+ $(GTK_LIBS) \
+@@ -204,7 +202,6 @@ libfm_pref_apps_CFLAGS = \
+ $(GTK_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(MENU_CACHE_CFLAGS) \
+- -Werror-implicit-function-declaration \
+ $(NULL)
+
+ libfm_pref_apps_LDADD = \
+@@ -225,7 +222,6 @@ libfm_demo_SOURCES = \
+ libfm_demo_CFLAGS = \
+ $(GTK_CFLAGS) \
+ $(MENU_CACHE_CFLAGS) \
+- -Werror-implicit-function-declaration \
+ $(NULL)
+
+ libfm_demo_LDADD = \
+@@ -314,7 +310,6 @@ gnome_terminal_SOURCES = \
+
+ gnome_terminal_CFLAGS = \
+ $(GLIB_CFLAGS) \
+- -Werror-implicit-function-declaration \
+ $(NULL)
+
+ gnome_terminal_LDADD = \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libfm-02-inline.diff Mon Aug 30 07:25:50 2010 +0000
@@ -0,0 +1,19 @@
+--- libfm-0.1.12/src/gtk/fm-folder-model.c-orig 2010-08-27 00:44:12.813734170 -0500
++++ libfm-0.1.12/src/gtk/fm-folder-model.c 2010-08-27 00:45:49.072139824 -0500
+@@ -256,14 +256,14 @@ FmFolderModel *fm_folder_model_new(FmFol
+ return model;
+ }
+
+-inline FmFolderItem* fm_folder_item_new(FmFileInfo* inf)
++static inline FmFolderItem* fm_folder_item_new(FmFileInfo* inf)
+ {
+ FmFolderItem* item = g_slice_new0(FmFolderItem);
+ item->inf = fm_file_info_ref(inf);
+ return item;
+ }
+
+-inline void fm_folder_item_free(FmFolderItem* item)
++static inline void fm_folder_item_free(FmFolderItem* item)
+ {
+ if( item->icon )
+ g_object_unref(item->icon);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pcmanfm-01-Wall.diff Mon Aug 30 07:25:50 2010 +0000
@@ -0,0 +1,22 @@
+--- pcmanfm-0.9.7/configure.ac-orig 2010-08-30 02:05:19.545165544 -0500
++++ pcmanfm-0.9.7/configure.ac 2010-08-30 02:05:26.960841128 -0500
+@@ -3,7 +3,7 @@
+
+ AC_PREREQ([2.63])
+ AC_INIT([pcmanfm], [0.9.7], [http://pcmanfm.sf.net/])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE()
+
+ AC_CONFIG_HEADERS([config.h])
+
+--- pcmanfm-0.9.7/src/Makefile.am-orig 2010-08-30 02:08:23.190752970 -0500
++++ pcmanfm-0.9.7/src/Makefile.am 2010-08-30 02:09:01.927018958 -0500
+@@ -31,8 +31,6 @@ pcmanfm_CFLAGS = \
+ $(FM_CFLAGS) \
+ $(MENU_CACHE_CFLAGS) \
+ $(G_CAST_CHECKS) \
+- -Wall \
+- -Werror-implicit-function-declaration \
+ $(NULL)
+
+ pcmanfm_LDADD = \
--- a/patches/pcmanfm-01-mnttab.diff Fri Aug 27 03:41:37 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- pcmanfm-0.5/src/vfs/vfs-volume-hal.c.orig 2009-03-16 11:17:42.181196352 +0800
-+++ pcmanfm-0.5/src/vfs/vfs-volume-hal.c 2009-03-16 11:20:21.884533143 +0800
-@@ -1542,6 +1542,16 @@
- }
-
- return fstab ? fstab->fs_spec : NULL;
-+#elif defined(sun)
-+ struct mnttab *mnt;
-+
-+ getmntent (handle, mnt);
-+
-+ if (mount_point != NULL && mnt != NULL) {
-+ *mount_point = mnt->mnt_mountp;
-+ }
-+
-+ return mnt ? mnt->mnt_fstype : NULL;
- #else
- struct mntent *mnt;
-
--- a/patches/pcmanfm-02-Werror.diff Fri Aug 27 03:41:37 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
---- pcmanfm-0.5/src/Makefile.am.orig 2009-03-13 00:37:47.504691870 +0800
-+++ pcmanfm-0.5/src/Makefile.am 2009-03-13 00:38:01.989683414 +0800
-@@ -126,8 +126,7 @@
- @GTK_CFLAGS@ \
- @SN_CFLAGS@ \
- @HAL_CFLAGS@ \
-- @G_CAST_CHECKS@ \
-- -Werror-implicit-function-declaration
-+ @G_CAST_CHECKS@
-
- pcmanfm_LDADD = @GTK_LIBS@ $(INTLLIBS) @FAM_LIBS@ @HAL_LIBS@ @SN_LIBS@
-
---- pcmanfm-0.5/src/Makefile.in.orig 2009-03-13 00:40:46.658473594 +0800
-+++ pcmanfm-0.5/src/Makefile.in 2009-03-13 00:40:53.955876118 +0800
-@@ -425,8 +425,7 @@ pcmanfm_CFLAGS = \
- @GTK_CFLAGS@ \
- @SN_CFLAGS@ \
- @HAL_CFLAGS@ \
-- @G_CAST_CHECKS@ \
-- -Werror-implicit-function-declaration
-+ @G_CAST_CHECKS@
-
- pcmanfm_LDADD = @GTK_LIBS@ $(INTLLIBS) @FAM_LIBS@ @HAL_LIBS@ @SN_LIBS@
- xml_purge_SOURCES = xml-purge.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pcmanfm-02-inline.diff Mon Aug 30 07:25:50 2010 +0000
@@ -0,0 +1,11 @@
+--- pcmanfm-0.9.7/src/desktop.c-orig 2010-08-30 02:11:49.191245684 -0500
++++ pcmanfm-0.9.7/src/desktop.c 2010-08-30 02:11:59.314596361 -0500
+@@ -1174,7 +1174,7 @@ FmDesktopItem* get_nearest_item(FmDeskto
+ return ret;
+ }
+
+-inline FmDesktopItem* desktop_item_new(GtkTreeIter* it)
++static inline FmDesktopItem* desktop_item_new(GtkTreeIter* it)
+ {
+ FmDesktopItem* item = g_slice_new0(FmDesktopItem);
+ item->it = *it;
--- a/patches/pcmanfm-03-union-struct-naming.diff Fri Aug 27 03:41:37 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
---- pcmanfm-0.5/src/vfs/vfs-dir.h.orig 2009-03-14 19:49:06.244577593 +0800
-+++ pcmanfm-0.5/src/vfs/vfs-dir.h 2009-03-14 20:06:25.929693165 +0800
-@@ -50,8 +50,8 @@
- gboolean is_mount_point : 1;
- gboolean is_remote : 1;
- gboolean is_virtual : 1;
-- };
-- };
-+ } bb;
-+ } aa;
-
- /*<private>*/
- VFSFileMonitor* monitor;
-@@ -67,6 +67,14 @@
- GSList* changed_files;
- };
-
-+#define flag aa.flags
-+#define is_home aa.bb.is_home
-+#define is_desktop aa.bb.is_desktop
-+#define is_trash aa.bb.is_trash
-+#define is_mount_point aa.bb.is_mount_point
-+#define is_remote aa.bb.is_remote
-+#define is_virtual aa.bb.is_virtual
-+
- struct _VFSDirClass
- {
- GObjectClass parent;
---- pcmanfm-0.5/src/vfs/vfs-dir.c.orig 2009-03-14 23:26:49.722237883 +0800
-+++ pcmanfm-0.5/src/vfs/vfs-dir.c 2009-03-14 20:06:38.227424328 +0800
-@@ -533,7 +533,7 @@
- if ( G_LIKELY(dir->path) )
- {
- dir->disp_path = g_filename_display_name( dir->path );
-- dir->flags = 0;
-+ dir->flag = 0;
-
- /* FIXME: We should check access here! */
-
---- pcmanfm-0.5/src/exo/exo-private.h.orig 2009-03-14 23:27:21.328490575 +0800
-+++ pcmanfm-0.5/src/exo/exo-private.h 2009-03-14 23:41:01.787415687 +0800
-@@ -36,6 +36,10 @@
-
- G_BEGIN_DECLS;
-
-+#if defined(__SUNPRO_C)
-+#define G_GNUC_INTERNAL
-+#endif
-+
- /* support macros for debugging */
- #ifndef NDEBUG
- #define _exo_assert(expr) g_assert (expr)