From 806e3329dbf823ec39fc6e28fe80e5c1a4403dc6a19f03222d156dad8087a050 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 16 May 2013 13:32:18 +0000 Subject: [PATCH] Accepting request 175730 from KDE:Distro:Factory Update to 3.2.0 OBS-URL: https://build.opensuse.org/request/show/175730 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=111 --- digikam-3.0.0.no-kdcraw.version-check.patch | 2 +- digikam-3.1.0.tar.bz2 | 3 - digikam-3.2.0.tar.bz2 | 3 + digikam-patch78541.diff | 158 -------------------- digikam.changes | 33 ++++ digikam.spec | 6 +- 6 files changed, 39 insertions(+), 166 deletions(-) delete mode 100644 digikam-3.1.0.tar.bz2 create mode 100644 digikam-3.2.0.tar.bz2 delete mode 100644 digikam-patch78541.diff diff --git a/digikam-3.0.0.no-kdcraw.version-check.patch b/digikam-3.0.0.no-kdcraw.version-check.patch index 157020a..9c147c1 100644 --- a/digikam-3.0.0.no-kdcraw.version-check.patch +++ b/digikam-3.0.0.no-kdcraw.version-check.patch @@ -76,5 +76,5 @@ diff -U3 -dHrN digikam-3.0.0/extra/kipi-plugins/CMakeLists.txt digikam-3.0.0.no- +# +# ENDIF (KDCRAW_VERSION) - # Optional depencies detection required by some plugins + # Optional dependencies detection required by some plugins MACRO_OPTIONAL_FIND_PACKAGE(EXPAT) # For DNGConverter: XMP SDK need Expat library to compile. diff --git a/digikam-3.1.0.tar.bz2 b/digikam-3.1.0.tar.bz2 deleted file mode 100644 index 54ca8ae..0000000 --- a/digikam-3.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f70fc84f3a680a855642fcc4664710116406bbe4068b0ad4d2cfb4127684c2aa -size 58559707 diff --git a/digikam-3.2.0.tar.bz2 b/digikam-3.2.0.tar.bz2 new file mode 100644 index 0000000..78de30c --- /dev/null +++ b/digikam-3.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd7204d42c4ef73f22e757ba5daa334073bd02ccc054c31780786d2b1a2a481a +size 58449068 diff --git a/digikam-patch78541.diff b/digikam-patch78541.diff deleted file mode 100644 index 92a3871..0000000 --- a/digikam-patch78541.diff +++ /dev/null @@ -1,158 +0,0 @@ -commit 1f0dbbd3b3a6246e8c66b038a3f1e06af2f5ee11 -Author: Gilles Caulier -Date: Mon Apr 1 14:59:20 2013 +0200 - - Apply patch #78541 from Marcus Meissner about to find devices by usb vendor and product id, also if libgphoto2 - just finds them by interface class. - BUGS: 311393 - FIXED-IN: 3.2.0 - -diff --git a/utilities/importui/backend/gpcamera.cpp b/utilities/importui/backend/gpcamera.cpp -index 708d424..a41dff1 100644 ---- a/core/utilities/importui/backend/gpcamera.cpp -+++ b/core/utilities/importui/backend/gpcamera.cpp -@@ -1295,8 +1295,7 @@ bool GPCamera::uploadItem(const QString& folder, const QString& itemName, const - #ifdef HAVE_GPHOTO2 - int errorCode; - CameraFile* cfile = 0; -- -- errorCode = gp_file_new(&cfile); -+ errorCode = gp_file_new(&cfile); - - if (errorCode != GP_OK) - { -@@ -1599,11 +1598,10 @@ void GPCamera::getSupportedCameras(int& count, QStringList& clist) - clist.clear(); - count = 0; - -- CameraAbilitiesList* abilList = 0; - CameraAbilities abil; -+ CameraAbilitiesList* abilList = 0; - GPContext* context = 0; -- -- context = gp_context_new(); -+ context = gp_context_new(); - - gp_abilities_list_new(&abilList); - gp_abilities_list_load(abilList, context); -@@ -1661,7 +1659,7 @@ void GPCamera::getSupportedPorts(QStringList& plist) - { - gp_port_info_list_get_info(list, i, &info); - #ifdef HAVE_GPHOTO25 -- char *xpath; -+ char* xpath = 0; - gp_port_info_get_name (info, &xpath); - plist.append(xpath); - #else -@@ -1685,8 +1683,7 @@ void GPCamera::getCameraSupportedPorts(const QString& model, QStringList& plist) - CameraAbilities abilities; - CameraAbilitiesList* abilList = 0; - GPContext* context = 0; -- -- context = gp_context_new(); -+ context = gp_context_new(); - - gp_abilities_list_new(&abilList); - gp_abilities_list_load(abilList, context); -@@ -1719,8 +1716,8 @@ int GPCamera::autoDetect(QString& model, QString& port) - GPPortInfoList* infoList = 0; - const char* camModel_ = 0, *camPort_ = 0; - GPContext* context = 0; -+ context = gp_context_new(); - -- context = gp_context_new(); - gp_list_new(&camList); - - gp_abilities_list_new(&abilList); -@@ -1789,8 +1786,9 @@ bool GPCamera::findConnectedUsbCamera(int vendorId, int productId, QString& mode - CameraList* camList = 0; - bool success = false; - // get name and port of detected camera -- const char* model_str = 0, *port_str = 0; -- context = gp_context_new(); -+ const char* model_str = 0; -+ const char* port_str = 0; -+ context = gp_context_new(); - - // get list of all ports - gp_port_info_list_new(&list); -@@ -1804,30 +1802,71 @@ bool GPCamera::findConnectedUsbCamera(int vendorId, int productId, QString& mode - gp_list_new (&camList); - gp_abilities_list_detect(abilList, list, camList, context); - gp_context_unref(context); -- gp_port_info_list_free(list); - - int count = gp_list_count(camList); -- int cnt = 0; -+ int cnt = 0; - - for (int i = 0 ; i < count ; i++) - { - const char* xmodel = 0; - gp_list_get_name(camList, i, &xmodel); -- int model = gp_abilities_list_lookup_model (abilList, xmodel); -+ int model = gp_abilities_list_lookup_model (abilList, xmodel); - CameraAbilities ab; -- gp_abilities_list_get_abilities (abilList, model, &ab); -+ gp_abilities_list_get_abilities(abilList, model, &ab); -+ -+ if (ab.port != GP_PORT_USB) -+ continue; -+ -+ /* KDE provides us USB Vendor and Product, but we might just -+ * have covered this via a class match. Check class matched -+ * cameras also for matchingo USB vendor/product id -+ */ -+ if (ab.usb_vendor == 0) -+ { -+ int ret; -+ GPPortInfo info; -+ const char* xport = 0; -+ GPPort* gpport = 0; -+ -+ /* get the port path so we only look at this bus position */ -+ gp_list_get_value(camList, i, &xport); -+ ret = gp_port_info_list_lookup_path (list, xport); - -- if (ab.port != GP_PORT_USB) continue; -- if (ab.usb_vendor != vendorId) continue; -- if (ab.usb_product != productId)continue; -+ if (ret < GP_OK) /* should not happen */ -+ continue; - -- /* keep it, and continue iterating, in case we find anohter one */ -+ /* get the lowlevel port info for the path */ -+ gp_port_info_list_get_info(list, ret, &info); -+ -+ /* open lowlevel driver interface briefly to search */ -+ gp_port_new(&gpport); -+ gp_port_set_info(gpport, info); -+ -+ /* And now call into the lowlevel usb driver to see if the bus position -+ * has that specific vendor/product id */ -+ if (gp_port_usb_find_device(gpport, vendorId, productId) == GP_OK) -+ { -+ ab.usb_vendor = vendorId; -+ ab.usb_product = productId; -+ } -+ -+ gp_port_free (gpport); -+ } -+ -+ if (ab.usb_vendor != vendorId) -+ continue; -+ -+ if (ab.usb_product != productId) -+ continue; -+ -+ /* keep it, and continue iterating, in case we find another one */ - gp_list_get_name (camList, i, &model_str); - gp_list_get_value(camList, i, &port_str); - - cnt++; - } - -+ gp_port_info_list_free(list); - gp_abilities_list_free(abilList); - - if (cnt > 0) diff --git a/digikam.changes b/digikam.changes index c695a33..fb94e81 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Tue May 14 21:53:56 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to 3.2.0: + digikam: + - General: Remove internal clapack library code. + Set only an optional and external dependency to + eigen3. + - General: New tool to Auto-Crop image based on black hole + borders detection. + - AlbumGUI: New "Table-View" view mode dedicated to show + album items in a list view. + - AlbumGUI: New Aspect-Ratio information displayed in + icon-view and tooltips. + - AlbumGUI: New filter based on Aspect-Ratio information. + - Searches: New search tool to find images based on + Aspect-Ratio Information. + - Searches: New search tool to find videos based on shot + properties. + - 46 fixed bugs. + kipi-plugins: + - FacebookExport: add new option to create private album. + - JAlbumExport: New too to export items to JAblum + - 10 fixed bugs. +- Drop patches included upstream: commit-006b3f4.diff and + digikam-patch78541.diff + +------------------------------------------------------------------- +Wed May 8 06:50:52 UTC 2013 - tittiatcoke@gmail.com + +- Add patch commit-006b3f4.diff from upstream to build + htmlexport again (bnc#816041) + ------------------------------------------------------------------- Mon Apr 15 14:14:46 UTC 2013 - tittiatcoke@gmail.com diff --git a/digikam.spec b/digikam.spec index 44177d4..b673abd 100644 --- a/digikam.spec +++ b/digikam.spec @@ -17,7 +17,7 @@ Name: digikam -Version: 3.1.0 +Version: 3.2.0 Release: 0 Summary: A KDE Photo Manager License: GPL-2.0+ @@ -36,8 +36,6 @@ Patch3: remove-gplv2-only.patch Patch5: digikam_no_build_vkontakte.diff # PATCH-FIX-UPSTREAM digikam-3.0.0.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken Patch6: digikam-3.0.0.no-kdcraw.version-check.patch -# PATCH-FIX-UPSTREAM digikam-patch78541.diff -- mmeisner@suse.com find devices by usb vendor and product id -Patch7: digikam-patch78541.diff BuildRequires: ImageMagick BuildRequires: bison BuildRequires: boost-devel @@ -249,7 +247,6 @@ popd %patch3 %patch5 %patch6 -p1 -%patch7 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -411,6 +408,7 @@ done %{_kde4_bindir}/panoramagui %{_kde4_bindir}/photolayoutseditor %{_kde4_configkcfgdir}/PLEConfigSkeleton.kcfgc +%dir %{_kde4_iconsdir}/hicolor/24x24/actions %{_kde4_iconsdir}/hicolor/*/actions/*.* %exclude %{_kde4_iconsdir}/hicolor/*/actions/gpsimagetag.png %{_kde4_iconsdir}/hicolor/*/apps/dngconverter.*