Date: Tuesday, October 14, 2014 @ 22:28:02
  Author: foutrelis
Revision: 120673

archrelease: copy trunk to community-i686, community-x86_64

Added:
  libfm/repos/community-i686/PKGBUILD
    (from rev 120672, libfm/trunk/PKGBUILD)
  libfm/repos/community-i686/libfm.install
    (from rev 120672, libfm/trunk/libfm.install)
  libfm/repos/community-x86_64/PKGBUILD
    (from rev 120672, libfm/trunk/PKGBUILD)
  libfm/repos/community-x86_64/libfm.install
    (from rev 120672, libfm/trunk/libfm.install)
Deleted:
  
libfm/repos/community-i686/0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
  libfm/repos/community-i686/PKGBUILD
  libfm/repos/community-i686/libfm.install
  
libfm/repos/community-x86_64/0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
  libfm/repos/community-x86_64/PKGBUILD
  libfm/repos/community-x86_64/libfm.install

--------------------------------------------------------------------------------+
 /PKGBUILD                                                                      
|  130 ++++++++++
 /libfm.install                                                                 
|   28 ++
 community-i686/0001-Fix-default-app-detection-in-App-chooser-combo-box.patch   
|   39 ---
 community-i686/PKGBUILD                                                        
|   73 -----
 community-i686/libfm.install                                                   
|   14 -
 community-x86_64/0001-Fix-default-app-detection-in-App-chooser-combo-box.patch 
|   39 ---
 community-x86_64/PKGBUILD                                                      
|   73 -----
 community-x86_64/libfm.install                                                 
|   14 -
 8 files changed, 158 insertions(+), 252 deletions(-)

Deleted: 
community-i686/0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
===================================================================
--- 
community-i686/0001-Fix-default-app-detection-in-App-chooser-combo-box.patch    
    2014-10-14 20:27:42 UTC (rev 120672)
+++ 
community-i686/0001-Fix-default-app-detection-in-App-chooser-combo-box.patch    
    2014-10-14 20:28:02 UTC (rev 120673)
@@ -1,39 +0,0 @@
-From 1a3f8dd076b119c685614ffe68a9cb732e2eeaee Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evange...@foutrelis.com>
-Date: Mon, 6 Oct 2014 16:41:09 +0300
-Subject: [PATCH] Fix default app detection in App chooser combo box
-
-Beginning with glib >= 2.41, g_app_info_get_all_for_type() no longer
-puts the default application in front of the list.
-
-So now we have to use g_app_info_get_default_for_type().
----
- src/gtk/fm-app-chooser-combo-box.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/gtk/fm-app-chooser-combo-box.c 
b/src/gtk/fm-app-chooser-combo-box.c
-index a9d544e..f8c5cb9 100644
---- a/src/gtk/fm-app-chooser-combo-box.c
-+++ b/src/gtk/fm-app-chooser-combo-box.c
-@@ -179,8 +179,7 @@ void fm_app_chooser_combo_box_setup(GtkComboBox* combo, 
FmMimeType* mime_type, G
-     {
-         data->mime_type = fm_mime_type_ref(mime_type);
-         apps = 
g_app_info_get_all_for_type(fm_mime_type_get_type(data->mime_type));
--        if(apps)
--            sel = G_APP_INFO(apps->data); /* default app is the first one in 
the list. */
-+        sel =  
g_app_info_get_default_for_type(fm_mime_type_get_type(data->mime_type), FALSE);
-     }
- 
-     for(l = apps; l; l = l->next)
-@@ -205,6 +204,8 @@ void fm_app_chooser_combo_box_setup(GtkComboBox* combo, 
FmMimeType* mime_type, G
-             g_list_foreach(apps, (GFunc)g_object_unref, NULL);
-             g_list_free(apps);
-         }
-+        if(sel)
-+            g_object_unref(sel);
-     }
- 
-     gtk_list_store_append(store, &it); /* separator */
--- 
-2.1.2
-

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD     2014-10-14 20:27:42 UTC (rev 120672)
+++ community-i686/PKGBUILD     2014-10-14 20:28:02 UTC (rev 120673)
@@ -1,73 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
-# Contributor: Unknown47 <unknown...@gmail.com>
-# Contributor: Angel Velasquez <an...@archlinux.org>
-# Contributor: Juergen Hoetzel <juer...@archlinux.org>
-
-pkgbase=libfm
-pkgname=(libfm libfm-extra)
-pkgver=1.2.2.1
-pkgrel=3
-pkgdesc='Library for file management'
-url='http://pcmanfm.sourceforge.net/'
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk2' 'menu-cache' 'desktop-file-utils' 'libexif' 'dbus-glib')
-makedepends=('udisks' 'intltool' 'gtk-doc')
-replaces=('lxshortcut')
-provides=('lxshortcut')
-conflicts=('lxshortcut')
-source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz
-        0001-Fix-default-app-detection-in-App-chooser-combo-box.patch)
-md5sums=('f898c480b142b56471377ef3a2810f2d'
-         '10ece6d3a98f1244a82929b7c7ceba2a')
-
-prepare() {
-  cd $pkgbase-$pkgver
-
-  patch -Np1 -i 
../0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
-}
-
-build() {
-  cd $pkgbase-$pkgver
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-udisks \
-    --with-gnu-ld
-  make
-}
-
-package_libfm() {
-  depends+=('libfm-extra')
-  install=libfm.install
-
-  cd $pkgbase-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Temporary fix to FS#32361
-  rm -rf "$pkgdir"/usr/include/libfm
-  mv "$pkgdir"/usr/include/libfm-1.0/ "$pkgdir"/usr/include/libfm
-
-  # Split libfm-extra
-  [[ -d $srcdir/libfm-extra ]] && rm -r "$srcdir/libfm-extra/"
-  mkdir "$srcdir"/libfm-extra
-  mv "$pkgdir"/usr/include/libfm/fm-{extra,version,xml-file}.h \
-     "$pkgdir"/usr/lib/libfm-extra.so* \
-     "$pkgdir"/usr/lib/pkgconfig/libfm-extra.pc \
-     "$srcdir/libfm-extra/"
-}
-
-package_libfm-extra() {
-  pkgdesc="Extra library for file management" 
-  depends=('glib2')
-  replaces=()
-  provides=()
-  conflicts=()
-
-  cd "$srcdir"/libfm-extra
-  mkdir -p "$pkgdir"/usr/{include/libfm,lib/pkgconfig}
-  mv *.h "$pkgdir/usr/include/libfm"
-  mv libfm-extra.so* "$pkgdir/usr/lib"
-  mv libfm-extra.pc "$pkgdir/usr/lib/pkgconfig"
-}

Copied: libfm/repos/community-i686/PKGBUILD (from rev 120672, 
libfm/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD                             (rev 0)
+++ community-i686/PKGBUILD     2014-10-14 20:28:02 UTC (rev 120673)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer:
+# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
+# Contributor: Unknown47 <unknown...@gmail.com>
+# Contributor: Angel Velasquez <an...@archlinux.org>
+# Contributor: Juergen Hoetzel <juer...@archlinux.org>
+
+pkgbase=libfm
+pkgname=(libfm libfm-extra)
+pkgver=1.2.3
+pkgrel=1
+pkgdesc='Library for file management'
+url='http://pcmanfm.sourceforge.net/'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2' 'menu-cache' 'desktop-file-utils' 'libexif' 'dbus-glib')
+makedepends=('udisks' 'intltool' 'gtk-doc')
+replaces=('lxshortcut')
+provides=('lxshortcut')
+conflicts=('lxshortcut')
+source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz)
+md5sums=('3ff38200701658f7e80e25ed395d92dd')
+
+build() {
+  cd $pkgbase-$pkgver
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --enable-udisks \
+    --with-gnu-ld
+  make
+}
+
+package_libfm() {
+  depends+=('libfm-extra')
+  install=libfm.install
+
+  cd $pkgbase-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Temporary fix to FS#32361
+  rm -rf "$pkgdir"/usr/include/libfm
+  mv "$pkgdir"/usr/include/libfm-1.0/ "$pkgdir"/usr/include/libfm
+
+  # Split libfm-extra
+  [[ -d $srcdir/libfm-extra ]] && rm -r "$srcdir/libfm-extra/"
+  mkdir "$srcdir"/libfm-extra
+  mv "$pkgdir"/usr/include/libfm/fm-{extra,version,xml-file}.h \
+     "$pkgdir"/usr/lib/libfm-extra.so* \
+     "$pkgdir"/usr/lib/pkgconfig/libfm-extra.pc \
+     "$srcdir/libfm-extra/"
+}
+
+package_libfm-extra() {
+  pkgdesc="Extra library for file management" 
+  depends=('glib2')
+  replaces=()
+  provides=()
+  conflicts=()
+
+  cd "$srcdir"/libfm-extra
+  mkdir -p "$pkgdir"/usr/{include/libfm,lib/pkgconfig}
+  mv *.h "$pkgdir/usr/include/libfm"
+  mv libfm-extra.so* "$pkgdir/usr/lib"
+  mv libfm-extra.pc "$pkgdir/usr/lib/pkgconfig"
+}

Deleted: community-i686/libfm.install
===================================================================
--- community-i686/libfm.install        2014-10-14 20:27:42 UTC (rev 120672)
+++ community-i686/libfm.install        2014-10-14 20:28:02 UTC (rev 120673)
@@ -1,14 +0,0 @@
-post_install() {
-  update-mime-database /usr/share/mime > /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-

Copied: libfm/repos/community-i686/libfm.install (from rev 120672, 
libfm/trunk/libfm.install)
===================================================================
--- community-i686/libfm.install                                (rev 0)
+++ community-i686/libfm.install        2014-10-14 20:28:02 UTC (rev 120673)
@@ -0,0 +1,14 @@
+post_install() {
+  update-mime-database /usr/share/mime > /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+

Deleted: 
community-x86_64/0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
===================================================================
--- 
community-x86_64/0001-Fix-default-app-detection-in-App-chooser-combo-box.patch  
    2014-10-14 20:27:42 UTC (rev 120672)
+++ 
community-x86_64/0001-Fix-default-app-detection-in-App-chooser-combo-box.patch  
    2014-10-14 20:28:02 UTC (rev 120673)
@@ -1,39 +0,0 @@
-From 1a3f8dd076b119c685614ffe68a9cb732e2eeaee Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evange...@foutrelis.com>
-Date: Mon, 6 Oct 2014 16:41:09 +0300
-Subject: [PATCH] Fix default app detection in App chooser combo box
-
-Beginning with glib >= 2.41, g_app_info_get_all_for_type() no longer
-puts the default application in front of the list.
-
-So now we have to use g_app_info_get_default_for_type().
----
- src/gtk/fm-app-chooser-combo-box.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/gtk/fm-app-chooser-combo-box.c 
b/src/gtk/fm-app-chooser-combo-box.c
-index a9d544e..f8c5cb9 100644
---- a/src/gtk/fm-app-chooser-combo-box.c
-+++ b/src/gtk/fm-app-chooser-combo-box.c
-@@ -179,8 +179,7 @@ void fm_app_chooser_combo_box_setup(GtkComboBox* combo, 
FmMimeType* mime_type, G
-     {
-         data->mime_type = fm_mime_type_ref(mime_type);
-         apps = 
g_app_info_get_all_for_type(fm_mime_type_get_type(data->mime_type));
--        if(apps)
--            sel = G_APP_INFO(apps->data); /* default app is the first one in 
the list. */
-+        sel =  
g_app_info_get_default_for_type(fm_mime_type_get_type(data->mime_type), FALSE);
-     }
- 
-     for(l = apps; l; l = l->next)
-@@ -205,6 +204,8 @@ void fm_app_chooser_combo_box_setup(GtkComboBox* combo, 
FmMimeType* mime_type, G
-             g_list_foreach(apps, (GFunc)g_object_unref, NULL);
-             g_list_free(apps);
-         }
-+        if(sel)
-+            g_object_unref(sel);
-     }
- 
-     gtk_list_store_append(store, &it); /* separator */
--- 
-2.1.2
-

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD   2014-10-14 20:27:42 UTC (rev 120672)
+++ community-x86_64/PKGBUILD   2014-10-14 20:28:02 UTC (rev 120673)
@@ -1,73 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
-# Contributor: Unknown47 <unknown...@gmail.com>
-# Contributor: Angel Velasquez <an...@archlinux.org>
-# Contributor: Juergen Hoetzel <juer...@archlinux.org>
-
-pkgbase=libfm
-pkgname=(libfm libfm-extra)
-pkgver=1.2.2.1
-pkgrel=3
-pkgdesc='Library for file management'
-url='http://pcmanfm.sourceforge.net/'
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk2' 'menu-cache' 'desktop-file-utils' 'libexif' 'dbus-glib')
-makedepends=('udisks' 'intltool' 'gtk-doc')
-replaces=('lxshortcut')
-provides=('lxshortcut')
-conflicts=('lxshortcut')
-source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz
-        0001-Fix-default-app-detection-in-App-chooser-combo-box.patch)
-md5sums=('f898c480b142b56471377ef3a2810f2d'
-         '10ece6d3a98f1244a82929b7c7ceba2a')
-
-prepare() {
-  cd $pkgbase-$pkgver
-
-  patch -Np1 -i 
../0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
-}
-
-build() {
-  cd $pkgbase-$pkgver
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-udisks \
-    --with-gnu-ld
-  make
-}
-
-package_libfm() {
-  depends+=('libfm-extra')
-  install=libfm.install
-
-  cd $pkgbase-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Temporary fix to FS#32361
-  rm -rf "$pkgdir"/usr/include/libfm
-  mv "$pkgdir"/usr/include/libfm-1.0/ "$pkgdir"/usr/include/libfm
-
-  # Split libfm-extra
-  [[ -d $srcdir/libfm-extra ]] && rm -r "$srcdir/libfm-extra/"
-  mkdir "$srcdir"/libfm-extra
-  mv "$pkgdir"/usr/include/libfm/fm-{extra,version,xml-file}.h \
-     "$pkgdir"/usr/lib/libfm-extra.so* \
-     "$pkgdir"/usr/lib/pkgconfig/libfm-extra.pc \
-     "$srcdir/libfm-extra/"
-}
-
-package_libfm-extra() {
-  pkgdesc="Extra library for file management" 
-  depends=('glib2')
-  replaces=()
-  provides=()
-  conflicts=()
-
-  cd "$srcdir"/libfm-extra
-  mkdir -p "$pkgdir"/usr/{include/libfm,lib/pkgconfig}
-  mv *.h "$pkgdir/usr/include/libfm"
-  mv libfm-extra.so* "$pkgdir/usr/lib"
-  mv libfm-extra.pc "$pkgdir/usr/lib/pkgconfig"
-}

Copied: libfm/repos/community-x86_64/PKGBUILD (from rev 120672, 
libfm/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD                           (rev 0)
+++ community-x86_64/PKGBUILD   2014-10-14 20:28:02 UTC (rev 120673)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer:
+# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
+# Contributor: Unknown47 <unknown...@gmail.com>
+# Contributor: Angel Velasquez <an...@archlinux.org>
+# Contributor: Juergen Hoetzel <juer...@archlinux.org>
+
+pkgbase=libfm
+pkgname=(libfm libfm-extra)
+pkgver=1.2.3
+pkgrel=1
+pkgdesc='Library for file management'
+url='http://pcmanfm.sourceforge.net/'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2' 'menu-cache' 'desktop-file-utils' 'libexif' 'dbus-glib')
+makedepends=('udisks' 'intltool' 'gtk-doc')
+replaces=('lxshortcut')
+provides=('lxshortcut')
+conflicts=('lxshortcut')
+source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz)
+md5sums=('3ff38200701658f7e80e25ed395d92dd')
+
+build() {
+  cd $pkgbase-$pkgver
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --enable-udisks \
+    --with-gnu-ld
+  make
+}
+
+package_libfm() {
+  depends+=('libfm-extra')
+  install=libfm.install
+
+  cd $pkgbase-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Temporary fix to FS#32361
+  rm -rf "$pkgdir"/usr/include/libfm
+  mv "$pkgdir"/usr/include/libfm-1.0/ "$pkgdir"/usr/include/libfm
+
+  # Split libfm-extra
+  [[ -d $srcdir/libfm-extra ]] && rm -r "$srcdir/libfm-extra/"
+  mkdir "$srcdir"/libfm-extra
+  mv "$pkgdir"/usr/include/libfm/fm-{extra,version,xml-file}.h \
+     "$pkgdir"/usr/lib/libfm-extra.so* \
+     "$pkgdir"/usr/lib/pkgconfig/libfm-extra.pc \
+     "$srcdir/libfm-extra/"
+}
+
+package_libfm-extra() {
+  pkgdesc="Extra library for file management" 
+  depends=('glib2')
+  replaces=()
+  provides=()
+  conflicts=()
+
+  cd "$srcdir"/libfm-extra
+  mkdir -p "$pkgdir"/usr/{include/libfm,lib/pkgconfig}
+  mv *.h "$pkgdir/usr/include/libfm"
+  mv libfm-extra.so* "$pkgdir/usr/lib"
+  mv libfm-extra.pc "$pkgdir/usr/lib/pkgconfig"
+}

Deleted: community-x86_64/libfm.install
===================================================================
--- community-x86_64/libfm.install      2014-10-14 20:27:42 UTC (rev 120672)
+++ community-x86_64/libfm.install      2014-10-14 20:28:02 UTC (rev 120673)
@@ -1,14 +0,0 @@
-post_install() {
-  update-mime-database /usr/share/mime > /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-

Copied: libfm/repos/community-x86_64/libfm.install (from rev 120672, 
libfm/trunk/libfm.install)
===================================================================
--- community-x86_64/libfm.install                              (rev 0)
+++ community-x86_64/libfm.install      2014-10-14 20:28:02 UTC (rev 120673)
@@ -0,0 +1,14 @@
+post_install() {
+  update-mime-database /usr/share/mime > /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+

Reply via email to