Arch Linux

AndyRTR

Developer

From: Magdeburg/Germany

Registered: 2005-10-07

Posts: 1,641

[x86_64] Xfc - Xfce foundation classes

The package is "orphan" in AUR. updated pkgbuild should look like this:

# Maintainer: Martin Lefebvre <dadexter>
# $Id$

pkgname=xfc
pkgver=4.3.1
pkgrel=1
pkgdesc="The Xfce Foundation Classes is a set of integrated C++ classes for developing Xfce applications on UNIX-like operating systems."
arch=(i686 x86_64)
url="http://xfc.xfce.org/"
license="GPL"
depends=(glibc gtk2 pango atk glib2 pkgconfig libsigc++2.0)
source=(http://xfc.xfce.org/download/$pkgver/src/$pkgname-$pkgver.tar.bz2
    http://foo-projects.org/pipermail/xfc-dev/attachments/20060415/fa6e42b7/keyfile.cc_x86_64.obj
    64bit.patch)
md5sums=('55e27abb68ef8c60b238e04eb95e9846' '57cdc64f89cb0758fbdf9f4e681f37f8'
         '2c0d9629925b5883097c4ba87d1fd0ad')

build() {
  export MAKEFLAGS="-j1"
  if [ "$CARCH" = "x86_64" ]; then
    cd $startdir/src/$pkgname-$pkgver/libXFCcore/xfc/glib
    patch -Np0 -i $startdir/keyfile.cc_x86_64.obj || return 1
    CONF="--disable-tests"
  fi
  cd $startdir/src/$pkgname-$pkgver
  [ "$CARCH" = "x86_64" ] && patch -Np0 -i $startdir/64bit.patch || return 1
  ./configure --prefix=/usr $CONF
  make || return 1
  make DESTDIR=$startdir/pkg install
}

keyfile.cc_x86_64.obj

--- keyfile.cc.org    2006-04-15 16:24:32.000000000 +0200
+++ keyfile.cc    2006-04-15 16:24:05.000000000 +0200
@@ -55,7 +55,7 @@
 std::vector<String> 
 G::KeyFile::get_groups() const
 {
-    unsigned int size;    
+    gsize size;    
     char **tmp_groups = g_key_file_get_groups(keyfile_, &size);
     std::vector<String> groups;
     groups.reserve(size);
@@ -74,7 +74,7 @@
 std::vector<String> 
 G::KeyFile::get_keys(const char *group_name, Error *error) const
 {
-    unsigned int size;    
+    gsize size;    
     char **tmp_keys = g_key_file_get_keys(keyfile_, group_name, &size, *error);
     std::vector<String> keys;
     keys.reserve(size);
@@ -186,7 +186,7 @@
 std::vector<String> 
 G::KeyFile::get_string_list(const char *group_name, const char *key, Error *error) const
 {
-    unsigned int size;    
+    gsize size;    
     char **tmp_strings = g_key_file_get_string_list(keyfile_, group_name, key, &size, *error);
     std::vector<String> strings;
     strings.reserve(size);
@@ -211,7 +211,7 @@
 std::vector<String> 
 G::KeyFile::get_string_list(const char *group_name, const char *key, const char *locale, Error *error) const
 {
-    unsigned int size;    
+    gsize size;    
     char **tmp_strings = g_key_file_get_locale_string_list(keyfile_, group_name, key, locale, &size, *error);
     std::vector<String> strings;
     strings.reserve(size);
@@ -236,7 +236,7 @@
 std::vector<bool> 
 G::KeyFile::get_boolean_list(const char *group_name, const char *key, Error *error) const
 {
-    unsigned int size;    
+    gsize size;    
     Error keyfile_error;    
     gboolean *tmp_values = g_key_file_get_boolean_list(keyfile_, group_name, key, &size, keyfile_error);
     std::vector<bool> values;
@@ -269,7 +269,7 @@
 std::vector<int> 
 G::KeyFile::get_integer_list(const char *group_name, const char *key, Error *error) const
 {
-    unsigned int size;    
+    gsize size;    
     Error keyfile_error;    
     int *tmp_values = g_key_file_get_integer_list(keyfile_, group_name, key, &size, keyfile_error);
     std::vector<int> values;

64bit.patch

--- examples/selection/selection.cc    2005-04-27 08:45:13.000000000 +0200
+++ examples/selection/selection.cc.new    2006-06-13 19:48:11.000000000 +0200
@@ -47,7 +47,7 @@
     cout << " * type() = " << selection_data.get_type() << endl;
     cout << " * format() = " << selection_data.format() << endl;
     cout.setf(ios_base::hex, ios_base::basefield);
-    cout << " * data() = 0x" << reinterpret_cast<unsigned>(selection_data.data()) << endl;
+    cout << " * data() = 0x" << reinterpret_cast<unsigned>(selection_data.data()) << endl;
     cout.setf(ios_base::dec, ios_base::basefield);
     cout << " * length() = " << selection_data.length() << endl << endl;
     

Well, the two patches could be merged. May anybody else do this.

So how to integrate now the common pkgbuild :?:  - I don't wanna be the maintainer :!:

AndyRTR