[Xfce4-commits] <xfce-installers:master> Add 4.8 installer.

Nick Schermer noreply at xfce.org
Mon Jan 17 13:50:01 CET 2011


Updating branch refs/heads/master
         to b591be26d91aad02d6ceeed2c6a287bb2ae3b30e (commit)
       from 2f4df4d5963da8931e3e358d595d4901d35d1087 (commit)

commit b591be26d91aad02d6ceeed2c6a287bb2ae3b30e
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jan 17 13:47:54 2011 +0100

    Add 4.8 installer.

 {xfce46 => xfce48}/Makefile                 |    2 +-
 {gtk2-xfce-engine => xfce48}/icon.png       |  Bin 9443 -> 9443 bytes
 {xfce42 => xfce48}/solaris-Xfce4logo.pm     |    0
 {xfce46 => xfce48}/solaris-Xresources.xfce4 |    4 +-
 {xfce44 => xfce48}/solaris-Xsession.xfce4   |    2 +-
 xfce46/xfce46.xml => xfce48/xfce48.xml      |  133 ++++++++-------------------
 6 files changed, 43 insertions(+), 98 deletions(-)

diff --git a/xfce46/Makefile b/xfce48/Makefile
similarity index 97%
copy from xfce46/Makefile
copy to xfce48/Makefile
index 252450a..acfe1ff 100644
--- a/xfce46/Makefile
+++ b/xfce48/Makefile
@@ -26,7 +26,7 @@ all: build
 build: installer checksums
 
 installer:
-	i2t-generate xfce46.xml
+	i2t-generate xfce48.xml
 
 checksums: installer
 	for file in *.run; do \
diff --git a/gtk2-xfce-engine/icon.png b/xfce48/icon.png
similarity index 100%
copy from gtk2-xfce-engine/icon.png
copy to xfce48/icon.png
diff --git a/xfce42/solaris-Xfce4logo.pm b/xfce48/solaris-Xfce4logo.pm
similarity index 100%
copy from xfce42/solaris-Xfce4logo.pm
copy to xfce48/solaris-Xfce4logo.pm
diff --git a/xfce46/solaris-Xresources.xfce4 b/xfce48/solaris-Xresources.xfce4
similarity index 81%
copy from xfce46/solaris-Xresources.xfce4
copy to xfce48/solaris-Xresources.xfce4
index 057a763..46bc9f0 100644
--- a/xfce46/solaris-Xresources.xfce4
+++ b/xfce48/solaris-Xresources.xfce4
@@ -2,7 +2,7 @@
 !!
 !!   Xresources.xfce4
 !!
-!!   Configuration file for the Xfce 4.6 alternate desktop resources
+!!   Configuration file for the Xfce 4.8 alternate desktop resources
 !!
 !!   (c) Copyright 2006-2007 os-cillation
 !!
@@ -12,7 +12,7 @@
 
 Dtlogin*altDtsIncrement:        True
 
-Dtlogin*altDtName:      Xfce 4.6 Desktop
+Dtlogin*altDtName:      Xfce 4.8 Desktop
 Dtlogin*altDtKey:       /usr/dt/config/Xsession.xfce4
 Dtlogin*altDtStart:     /usr/dt/config/Xsession.xfce4
 Dtlogin*altDtLogo:      Xfce4logo
diff --git a/xfce44/solaris-Xsession.xfce4 b/xfce48/solaris-Xsession.xfce4
similarity index 88%
copy from xfce44/solaris-Xsession.xfce4
copy to xfce48/solaris-Xsession.xfce4
index 16b5470..8a31eff 100755
--- a/xfce44/solaris-Xsession.xfce4
+++ b/xfce48/solaris-Xsession.xfce4
@@ -18,7 +18,7 @@ if test -z "$SDT_ALT_SESSION" ; then
 fi
 
 if test -z "$SDT_ALT_HELLO"; then
-  export SDT_ALT_HELLO="/usr/dt/bin/dthello -string 'Xfce 4.4 Desktop' &"
+  export SDT_ALT_HELLO="/usr/dt/bin/dthello -string 'Xfce 4.8 Desktop' &"
 fi
 
 export SDT_NO_DSDM=""
diff --git a/xfce46/xfce46.xml b/xfce48/xfce48.xml
similarity index 86%
copy from xfce46/xfce46.xml
copy to xfce48/xfce48.xml
index 030849c..5bd5148 100644
--- a/xfce46/xfce46.xml
+++ b/xfce48/xfce48.xml
@@ -4,7 +4,7 @@
   <i2t:application>
     <name>xfce4</name>
     <title>Xfce Desktop Environment</title>
-    <version>4.6</version>
+    <version>4.8</version>
 
     <image name="icon">icon.png</image>
 
@@ -20,16 +20,16 @@
   <i2t:dependencies>
     <dependency type="package">
       <name>glib-2.0</name>
-      <version>2.12.0</version>
+      <version>2.18.0</version>
       <description>
-        The Glib library provides useful routines for C programs. Version 2.12.0 is required here.
+        The Glib library provides useful routines for C programs.
         Debian/Ubuntu users should install the libglib2.0-dev package.
       </description>
     </dependency>
 
     <dependency type="package">
       <name>gtk+-2.0</name>
-      <version>2.10.0</version>
+      <version>2.14.0</version>
       <description>
         The GTK+ library provides widgets used for the user interface of all Xfce applications.
         Debian/Ubuntu users should install the libgtk2.0-dev package.
@@ -37,22 +37,22 @@
     </dependency>
 
     <dependency type="package">
-      <name>gtk-doc</name>
-      <version>1.10</version>
-      <description>GTK-Doc can be used to document APIs and application documentation.</description>
+      <name>gdk-pixbuf-2.0</name>
+      <version>2.14.0</version>
+      <description>
+        The image loading library for GTK+.
+      </description>
     </dependency>
 
     <dependency type="package">
-      <name>libglade-2.0</name>
-      <version>2.0.0</version>
-      <description>
-        The GLADE library is used for loading GUI descriptions from XML files.
-      </description>
+      <name>gtk-doc</name>
+      <version>1.10</version>
+      <description>GTK-Doc can be used to document APIs and application documentation.</description>
     </dependency>
 
     <dependency type="package">
       <name>vte</name>
-      <version>0.11.11</version>
+      <version>0.17.1</version>
       <description>
         The VTE terminal widget is used in the Xfce Terminal.
       </description>
@@ -68,31 +68,6 @@
     </dependency>
 
     <dependency type="package">
-      <name>libpng12</name>
-      <version>1.2.0</version>
-      <description>
-        The PNG library is used to implement the Thumbnail Management Standard, which uses PNG to store
-        thumbnails and associated data. Debian/Ubuntu users should install the libpng12-dev package.
-      </description>
-    </dependency>
-
-    <dependency type="library" optional="true">
-      <name>jpeg</name>
-      <description>
-        The JPEG library is used to enable fast thumbnailing of JPEG images (optionally using EXIF
-        embedded thumbnails). Debian/Ubuntu users should install the libjpeg62-dev package.
-      </description>
-    </dependency>
-
-    <dependency type="package" optional="true">
-      <name>gconf-2.0</name>
-      <version>2.4.0</version>
-      <description>
-        GConf is used for GNOME thumbnailers support in Thunar.
-      </description>
-    </dependency>
-
-    <dependency type="package">
       <name>xi</name>
       <version>1.0.0</version>
       <description>
@@ -112,21 +87,13 @@
 
     <dependency type="package">
       <name>libwnck-1.0</name>
-      <version>2.12.0</version>
+      <version>2.22.0</version>
       <description>
         libwnck is a library for accessing and manipulating window attributes. It is used for
         writing things like pagers and tasklists.
       </description>
     </dependency>
 
-    <dependency type="package">
-      <name>gstreamer-plugins-base-0.10</name>
-      <version>0.10.2</version>
-      <description>
-        The Xfce mixer now uses GStreamer to support more sound systems and servers.
-      </description>
-    </dependency>
-
     <dependency type="program">
       <name>iceauth</name>
       <description>
@@ -185,17 +152,6 @@
     </dependency>
 
     <dependency type="package" optional="true">
-      <name>hal-storage</name>
-      <version>0.5.7</version>
-      <description>
-        This package provides support for the Hardware Abstraction Layer (HAL) in Xfce. This enables
-        support for removable media in Thunar and xfdesktop, support to shutdown the computer via HAL
-        and automatic management of removable devices. Debian/Ubuntu users should install the
-        libhal-storage-dev package.
-      </description>
-    </dependency>
-
-    <dependency type="package" optional="true">
       <name>dbus-glib-1</name>
       <version>0.73</version>
       <description>
@@ -284,7 +240,7 @@
       </description>
       <action case="enabled">
         CFLAGS="${CFLAGS} -O2 -pipe";
-        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --enable-final";
+        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --enable-linker-opts";
         export CFLAGS CONFIGURE_FLAGS;
       </action>
     </option>
@@ -301,7 +257,7 @@
         option above on some systems.
       </description>
       <action case="enabled">
-        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --enable-debug";
+        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --enable-debug --disable-linker-opts";
         export CONFIGURE_FLAGS;
       </action>
       <action case="disabled">
@@ -345,13 +301,28 @@
     </package>
 
     <package>
-      <name>libxfce4menu</name>
+      <name>libxfce4ui</name>
+      <title>User Interface Library</title>
+      <pre-action stage="configure">
+        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-gladeui-catalogdir=${PREFIX}/share/glade3/catalogs";
+        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-gladeui-moduledir=${PREFIX}/lib/glade3/modules";
+        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-gladeui-pixmapdir=${PREFIX}/share/glade3/pixmaps";
+        export CONFIGURE_FLAGS;
+      </pre-action>
+    </package>
+
+    <package>
+      <name>garcon</name>
       <title>Xfce Menu Library</title>
     </package>
 
     <package>
       <name>exo</name>
       <title>Extension library</title>
+      <pre-action stage="configure">
+        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-gio-module-dir=${PREFIX}/lib//gio/modules";
+        export CONFIGURE_FLAGS;
+      </pre-action>
     </package>
 
     <package>
@@ -360,17 +331,6 @@
     </package>
 
     <package>
-      <name>libxfcegui4</name>
-      <title>Xfce GUI Library</title>
-      <pre-action stage="configure">
-        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-libglade-module-path=${PREFIX}/lib/libglade/2.0/";
-        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-gladeui-data-root=${PREFIX}/share/glade3/";
-        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-gladeui-module-path=${PREFIX}/lib/glade3/modules/";
-        export CONFIGURE_FLAGS;
-      </pre-action>
-    </package>
-
-    <package>
       <name>xfce4-settings</name>
       <title>Xfce Settings Dialogs and Daemons</title>
     </package>
@@ -378,10 +338,10 @@
     <package>
       <name>xfce-utils</name>
       <title>Xfce Utilities</title>
-      
+
       <pre-action stage="configure">
-        ## 
-        ## Make sure the xsession .desktop file is installed into PREFIX. The 
+        ##
+        ## Make sure the xsession .desktop file is installed into PREFIX. The
         ## location defaults to /usr and thus breaks installation for normal
         ## users unless it is explicitely defined.
         ##
@@ -571,11 +531,6 @@ EOF
     </package>
 
     <package>
-      <name>orage</name>
-      <title>Xfce Calendar Application</title>
-    </package>
-
-    <package>
       <name>Terminal</name>
       <title>Terminal Emulator</title>
     </package>
@@ -586,13 +541,13 @@ EOF
     </package>
 
     <package>
-      <name>xfce4-appfinder</name>
-      <title>Xfce Application Finder</title>
+      <name>tumbler</name>
+      <title>Thumbnailing service</title>
     </package>
 
     <package>
-      <name>xfce4-mixer</name>
-      <title>Xfce Volume Control</title>
+      <name>xfce4-appfinder</name>
+      <title>Xfce Application Finder</title>
     </package>
 
     <package>
@@ -606,19 +561,9 @@ EOF
     </package>
 
     <package>
-      <name>xfprint</name>
-      <title>Xfce Printing Support</title>
-    </package>
-
-    <package>
       <name>xfwm4</name>
       <title>Xfce Window Manager</title>
     </package>
-
-    <package>
-      <name>xfwm4-themes</name>
-      <title>Xfce Window Themes</title>
-    </package>
   </i2t:packages>
 
 </installer>



More information about the Xfce4-commits mailing list