[arch-commits] Commit in kipi-plugins/repos (6 files)
Tobias Powalowski
tpowa at archlinux.org
Wed Feb 11 13:53:23 UTC 2009
Date: Wednesday, February 11, 2009 @ 08:53:22
Author: tpowa
Revision: 26703
Merged revisions 26701 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/kipi-plugins/trunk
........
r26701 | tpowa | 2009-02-11 13:48:24 +0000 (Mi, 11 Feb 2009) | 1 line
upgpkg: kipi-plugins 0.1.6-1
........
Modified:
kipi-plugins/repos/extra-i686/ (properties)
kipi-plugins/repos/extra-i686/PKGBUILD
Deleted:
kipi-plugins/repos/extra-i686/disable_ipod.patch
kipi-plugins/repos/extra-i686/kameraklient.patch
kipi-plugins/repos/extra-i686/kipi-plugins.install
kipi-plugins/repos/extra-i686/post-0.1.3.patch.bz2
----------------------+
PKGBUILD | 20 +++-----
disable_ipod.patch | 13 -----
kameraklient.patch | 117 -------------------------------------------------
kipi-plugins.install | 20 --------
4 files changed, 9 insertions(+), 161 deletions(-)
Property changes on: kipi-plugins/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /kipi-plugins/trunk:1-6607
+ /kipi-plugins/trunk:1-26702
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-02-11 13:48:59 UTC (rev 26702)
+++ extra-i686/PKGBUILD 2009-02-11 13:53:22 UTC (rev 26703)
@@ -1,28 +1,26 @@
# $Id$
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# 0.1.3-1 -> 0.1.3-2 : rebuild against exiv2=0.13, libnamechange 0.12 -> 0.13 - damir
-# 0.1.4-2: rebuild for libgpod 0.5.2 upgrade, aaron
-
pkgname=kipi-plugins
-pkgver=0.1.5
-pkgrel=2
+pkgver=0.1.6
+pkgrel=1
pkgdesc="libkipi plugins for digikam and kde apps"
arch=("i686" "x86_64")
license=('GPL')
url="http://www.kipi-plugins.org"
depends=('libkexiv2>=0.1.7' 'libkipi' 'libgphoto2' 'exiv2>=0.17.1' 'libgpod>=0.6.0' 'libkdcraw>=0.1.4')
-install=('kipi-plugins.install')
-source=("http://dl.sourceforge.net/sourceforge/kipi/$pkgname-0.1.5.tar.bz2")
-md5sums=('099122d802530d22e69b314b3e97e30b')
+source=("http://dl.sourceforge.net/sourceforge/kipi/$pkgname-0.1.6.tar.bz2")
+optdepends=('k3b: for burning support'
+ 'mjpegtools: for vcd support'
+ 'imagemagick: for picture manipulation'
+ 'dcraw: for raw images')
build() {
- cd $startdir/src/$pkgname-0.1.5
-
+ cd $startdir/src/$pkgname-0.1.6
source /etc/profile.d/qt3.sh
-
#make -f admin/Makefile.common
./configure --prefix=/opt/kde --disable-debug --without-arts
make || return 1
make DESTDIR=$startdir/pkg/ install
}
+md5sums=('0d2b7fafcafd93822475a727a23e7d9d')
Deleted: extra-i686/disable_ipod.patch
===================================================================
--- extra-i686/disable_ipod.patch 2009-02-11 13:48:59 UTC (rev 26702)
+++ extra-i686/disable_ipod.patch 2009-02-11 13:53:22 UTC (rev 26703)
@@ -1,13 +0,0 @@
-Index: Makefile.am
-===================================================================
---- kipi-plugins/Makefile.am (revisione 610629)
-+++ kipi-plugins/Makefile.am (copia locale)
-@@ -21,7 +21,7 @@
- endif
-
- if compile_IPODEXPORT
--IPODEXPORTDIR = ipodexport
-+#IPODEXPORTDIR = ipodexport
- endif
-
- SUBDIRS = common printwizard calendar mpegencoder cdarchiving simpleviewerexport \
Deleted: extra-i686/kameraklient.patch
===================================================================
--- extra-i686/kameraklient.patch 2009-02-11 13:48:59 UTC (rev 26702)
+++ extra-i686/kameraklient.patch 2009-02-11 13:53:22 UTC (rev 26703)
@@ -1,117 +0,0 @@
-Index: gpcamera.cpp
-===================================================================
---- kipi-plugins/kameraklient/gpcamera.cpp (revisione 611560)
-+++ kipi-plugins/kameraklient/gpcamera.cpp (copia locale)
-@@ -202,7 +202,7 @@
- }
-
- int GPCamera::getSubFolders(const QString& folder, QValueList<QString>& subFolderList) {
-- ::CameraList *clist;
-+ CameraList *clist;
- gp_list_new(&clist);
- if (status) {
- delete status;
-@@ -250,7 +250,7 @@
- }
-
- int GPCamera::getItemsInfo(const QString& folder, GPFileItemInfoList& infoList) {
-- ::CameraList *clist;
-+ CameraList *clist;
- const char *cname;
- if (status) {
- delete status;
-@@ -561,35 +561,39 @@
- }
-
- int GPCamera::autoDetect(QString& model, QString& port) {
-- ::CameraList camList;
-+ CameraList *pCamList;
- CameraAbilitiesList *abilList;
- GPPortInfoList *infoList;
- const char *camModel_, *camPort_;
- GPContext *context;
-
- context = gp_context_new ();
-+ gp_list_new(&pCamList);
-
- gp_abilities_list_new (&abilList);
- gp_abilities_list_load (abilList, context);
- gp_port_info_list_new (&infoList);
- gp_port_info_list_load (infoList);
-- gp_abilities_list_detect (abilList, infoList, &camList, context);
-+ gp_abilities_list_detect (abilList, infoList, pCamList, context);
- gp_abilities_list_free (abilList);
- gp_port_info_list_free (infoList);
-
- gp_context_unref( context );
-
-- int count = gp_list_count (&camList);
-+ int count = gp_list_count (pCamList);
-
- if (count<=0) {
-+ gp_list_free(pCamList);
- return -1;
- }
- for (int i = 0; i < count; i++) {
-- gp_list_get_name (&camList, i, &camModel_);
-- gp_list_get_value (&camList, i, &camPort_);
-+ gp_list_get_name (pCamList, i, &camModel_);
-+ gp_list_get_value (pCamList, i, &camPort_);
- }
- model = camModel_;
- port = camPort_;
-+ gp_list_free(pCamList);
-+
- return 0;
- }
-
-Index: gpiface.cpp
-===================================================================
---- kipi-plugins/kameraklient/gpiface.cpp (revisione 611560)
-+++ kipi-plugins/kameraklient/gpiface.cpp (copia locale)
-@@ -33,37 +33,40 @@
- {
-
- int GPIface::autoDetect(QString& model, QString& port) {
-- ::CameraList camList;
-+ CameraList *pCamList;
- CameraAbilitiesList *abilList;
- GPPortInfoList *infoList;
- const char *camModel_, *camPort_;
- GPContext *context;
-
- context = gp_context_new ();
-+ gp_list_new(&pCamList);
-
- gp_abilities_list_new (&abilList);
- gp_abilities_list_load (abilList, context);
- gp_port_info_list_new (&infoList);
- gp_port_info_list_load (infoList);
-- gp_abilities_list_detect (abilList, infoList, &camList, context);
-+ gp_abilities_list_detect (abilList, infoList, pCamList, context);
- gp_abilities_list_free (abilList);
- gp_port_info_list_free (infoList);
-
- gp_context_unref( context );
-
-- int count = gp_list_count (&camList);
-+ int count = gp_list_count (pCamList);
-
- if (count<=0) {
-+ gp_list_free(pCamList);
- return -1;
- }
-
- for (int i = 0; i < count; i++) {
-- gp_list_get_name (&camList, i, &camModel_);
-- gp_list_get_value (&camList, i, &camPort_);
-+ gp_list_get_name (pCamList, i, &camModel_);
-+ gp_list_get_value (pCamList, i, &camPort_);
- }
-
- model = camModel_;
- port = camPort_;
-+ gp_list_free(pCamList);
-
- return 0;
- }
Deleted: extra-i686/kipi-plugins.install
===================================================================
--- extra-i686/kipi-plugins.install 2009-02-11 13:48:59 UTC (rev 26702)
+++ extra-i686/kipi-plugins.install 2009-02-11 13:53:22 UTC (rev 26703)
@@ -1,20 +0,0 @@
-# This is a default template for a post-install scriptlet. You can
-# remove any functions you don't need (and this header).
-
-# arg 1: the new package version
-post_install() {
-cat << EOF
-Note kipi-plugins runtime depends are:
-==> k3b,mjpegtools,imagemagick,kdebase,dcraw
-EOF
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-op=$1
-shift
-$op $*
Deleted: extra-i686/post-0.1.3.patch.bz2
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list