From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 9 08:30:07 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 063D91065670 for ; Tue, 9 Jun 2009 08:30:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D10528FC0A for ; Tue, 9 Jun 2009 08:30:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n598U6dv071534 for ; Tue, 9 Jun 2009 08:30:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n598U6V5071530; Tue, 9 Jun 2009 08:30:06 GMT (envelope-from gnats) Resent-Date: Tue, 9 Jun 2009 08:30:06 GMT Resent-Message-Id: <200906090830.n598U6V5071530@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Jason E. Hale" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0ACF01065674 for ; Tue, 9 Jun 2009 08:21:39 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from yw-out-2324.google.com (yw-out-2324.google.com [74.125.46.31]) by mx1.freebsd.org (Postfix) with ESMTP id 903D48FC12 for ; Tue, 9 Jun 2009 08:21:38 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: by yw-out-2324.google.com with SMTP id 9so2150422ywe.13 for ; Tue, 09 Jun 2009 01:21:38 -0700 (PDT) Received: by 10.90.106.4 with SMTP id e4mr3395782agc.107.1244535696998; Tue, 09 Jun 2009 01:21:36 -0700 (PDT) Received: from mocha.verizon.net (c-24-3-41-151.hsd1.oh.comcast.net [24.3.41.151]) by mx.google.com with ESMTPS id 7sm1269859agd.3.2009.06.09.01.21.35 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 09 Jun 2009 01:21:36 -0700 (PDT) Message-Id: <4a2e1b90.07045a0a.222d.ffffa7ed@mx.google.com> Date: Tue, 09 Jun 2009 01:21:36 -0700 (PDT) From: "Jason E. Hale" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: kris@pcbsd.org Subject: ports/135403: [PATCH] graphics/kipi-plugins-kde4: Fix build X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Jason E. Hale" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2009 08:30:07 -0000 >Number: 135403 >Category: ports >Synopsis: [PATCH] graphics/kipi-plugins-kde4: Fix build >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jun 09 08:30:06 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Jason E. Hale >Release: FreeBSD 7.2-RELEASE i386 >Organization: none >Environment: System: FreeBSD mocha.verizon.net 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Mon May 4 04:03:46 EDT 2009 root@mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA7 i386 KDE 4.2.3 QT 4.4.3 >Description: Build for graphics/kipi-plugins-kde4 fails if QT3 and KDE3 versions of kipi, kdcraw, and kexiv2 are installed. 1. Port fails to build with multiple errors due to QT3 style headers. 2. When KDE3 versions of kipi, kdcraw, and kexiv2 are installed, they are detected instead of KDE4 versions. 3. IpodExport plugin requires audio/libgpod >= 0.7.0; currently ports has 0.6.0 4. Gdk and Gpod don't get detected properly. >How-To-Repeat: Try to build graphics/kipi-plugins-kde4 with QT3 and KDE3 versions of kipi installed. >Fix: Use attached diff to fix build. 1. Patch includes replacement list to convert QT3 style headers to QT4 style. 2. Fix patch-CMakeLists.txt so that KDE4 versions of kipi, kdcraw, and kexiv2 are detected. 3. Disable required libraries for IpodExport and remove dependency on audio/libgpod. 4. Fix Find*.cmake so Gdk and Gpod get detected. Misc: - kdebase is not needed as dependency; it is only needed for wallpaper plugin which is currently disabled - add more specific QT_COMPONENTS - remove entries from pkg-plist that are installed by kdehier - bump PORTREVISION due to dependency changes --- 2009-06-09-kipi-plugins-kde4.diff begins here --- diff -ruN kipi-plugins-kde4.orig/Makefile kipi-plugins-kde4/Makefile --- kipi-plugins-kde4.orig/Makefile 2009-06-08 02:26:06.000000000 -0400 +++ kipi-plugins-kde4/Makefile 2009-06-09 03:18:25.000000000 -0400 @@ -7,7 +7,7 @@ PORTNAME= kipi-plugins PORTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics kde MASTER_SITES= SF/kipi @@ -17,16 +17,24 @@ COMMENT= KDE4 kipi graphics plugins LIB_DEPENDS= cv.1:${PORTSDIR}/graphics/opencv \ - gpod.3:${PORTSDIR}/audio/libgpod \ expat.6:${PORTSDIR}/textproc/expat2 \ kipi.6:${PORTSDIR}/graphics/kdegraphics4 RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick USE_BZIP2= yes USE_CMAKE= yes -USE_KDE4= automoc4 kdehier kdeprefix pimlibs kdebase +USE_KDE4= automoc4 kdehier kdeprefix kdelibs pimlibs USE_QT_VER= 4 -QT_COMPONENTS= corelib qmake_build moc_build rcc_build uic_build +QT_COMPONENTS= gui dbus network svg xml \ + qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes +# Disable IpodExport plugin for now. Requires audio/libgpod >= 0.7.0. +CMAKE_ARGS= -DWITH_GLIB2:BOOL=OFF -DWITH_GObject:BOOL=OFF \ + -DWITH_Gdk:BOOL=OFF -DWITH_Gpod:BOOL=OFF + +post-patch: + ${GREP} -H -r "#include diff -ruN kipi-plugins-kde4.orig/files/patch-CMakeLists.txt kipi-plugins-kde4/files/patch-CMakeLists.txt --- kipi-plugins-kde4.orig/files/patch-CMakeLists.txt 2009-06-08 02:26:06.000000000 -0400 +++ kipi-plugins-kde4/files/patch-CMakeLists.txt 2009-06-08 04:45:00.000000000 -0400 @@ -1,191 +1,64 @@ ---- CMakeLists.txt.orig 2009-01-05 02:37:00.000000000 -0600 -+++ CMakeLists.txt 2009-01-28 11:30:36.000000000 -0600 -@@ -33,6 +33,183 @@ +--- ./CMakeLists.txt.orig 2009-03-17 04:59:48.000000000 -0400 ++++ ./CMakeLists.txt 2009-06-08 04:36:50.000000000 -0400 +@@ -32,15 +32,53 @@ + INCLUDE(FindPackageHandleStandardArgs) INCLUDE(KDE4Defaults) INCLUDE(MacroLibrary) ++INCLUDE(FindPkgConfig) -+ message(STATUS "Check Kexiv2 library using pkg-config...") -+ -+ # use pkg-config to get the directories and then use these values -+ # in the FIND_PATH() and FIND_LIBRARY() calls -+ INCLUDE(UsePkgConfig) -+ -+ PKGCONFIG(libkexiv2-kde4 _KEXIV2IncDir _KEXIV2LinkDir _KEXIV2LinkFlags _KEXIV2Cflags) -+ -+ if(_KEXIV2LinkFlags) -+ # query pkg-config asking for a libkexiv2 >= 0.2.0 -+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2-kde4 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) -+ if(_return_VALUE STREQUAL "0") -+ message(STATUS "Found libkexiv2 release >= 0.2.0") -+ set(KEXIV2_VERSION_GOOD_FOUND TRUE) -+ else(_return_VALUE STREQUAL "0") -+ message(STATUS "Found libkexiv2 release < 0.2.0, too old") -+ set(KEXIV2_VERSION_GOOD_FOUND FALSE) -+ set(KEXIV2_FOUND FALSE) -+ endif(_return_VALUE STREQUAL "0") -+ else(_KEXIV2LinkFlags) -+ set(KEXIV2_VERSION_GOOD_FOUND FALSE) -+ set(KEXIV2_FOUND FALSE) -+ endif(_KEXIV2LinkFlags) -+ -+ if(KEXIV2_VERSION_GOOD_FOUND) -+ set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}") -+ -+ FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h -+ ${_KEXIV2IncDir} -+ ) -+ -+ FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2 -+ PATHS -+ ${_KEXIV2LinkDir} -+ ) -+ -+ if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) -+ set(KEXIV2_FOUND TRUE) -+ endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) -+ endif(KEXIV2_VERSION_GOOD_FOUND) -+ if (KEXIV2_FOUND) -+ if (NOT Kexiv2_FIND_QUIETLY) -+ message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}") -+ endif (NOT Kexiv2_FIND_QUIETLY) -+ else (KEXIV2_FOUND) -+ if (Kexiv2_FIND_REQUIRED) -+ if (NOT KEXIV2_INCLUDE_DIR) -+ message(FATAL_ERROR "Could NOT find libkexiv2 header files") -+ endif (NOT KEXIV2_INCLUDE_DIR) -+ if (NOT KEXIV2_LIBRARIES) -+ message(FATAL_ERROR "Could NOT find libkexiv2 library") -+ endif (NOT KEXIV2_LIBRARIES) -+ endif (Kexiv2_FIND_REQUIRED) -+ endif (KEXIV2_FOUND) -+ -+ MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES) -+ -+ -+# Find the KDCraw libary now -+ message(STATUS "Check Kdcraw library using pkg-config...") -+ if(NOT WIN32) -+ # use pkg-config to get the directories and then use these values -+ # in the FIND_PATH() and FIND_LIBRARY() calls -+ INCLUDE(UsePkgConfig) -+ -+ PKGCONFIG(libkdcraw-kde4 _KDCRAWIncDir _KDCRAWLinkDir _KDCRAWLinkFlags _KDCRAWCflags) -+ -+ if(_KDCRAWLinkFlags) -+ # query pkg-config asking for a libkdcraw >= 0.2.0 -+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkdcraw-kde4 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) -+ if(_return_VALUE STREQUAL "0") -+ message(STATUS "Found libkdcraw release >= 0.2.0") -+ set(KDCRAW_VERSION_GOOD_FOUND TRUE) -+ else(_return_VALUE STREQUAL "0") -+ message(STATUS "Found libkdcaw release < 0.2.0, too old") -+ set(KDCRAW_VERSION_GOOD_FOUND FALSE) -+ set(KDCRAW_FOUND FALSE) -+ endif(_return_VALUE STREQUAL "0") -+ else(_KDCRAWLinkFlags) -+ set(KDCRAW_VERSION_GOOD_FOUND FALSE) -+ set(KDCRAW_FOUND FALSE) -+ endif(_KDCRAWLinkFlags) -+ ELSE(NOT WIN32) -+ set(KDCRAW_VERSION_GOOD_FOUND TRUE) -+ ENDif(NOT WIN32) -+ -+ if(KDCRAW_VERSION_GOOD_FOUND) -+ set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}") -+ -+ FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h -+ ${_KDCRAWIncDir} -+ ) -+ -+ FIND_LIBRARY(KDCRAW_LIBRARIES NAMES kdcraw -+ PATHS -+ ${_KDCRAWLinkDir} -+ ) -+ -+ if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) -+ set(KDCRAW_FOUND TRUE) -+ set(KDCRAW_FOR_DNGCONVERTER TRUE) -+ endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) -+ endif(KDCRAW_VERSION_GOOD_FOUND) -+ if (KDCRAW_FOUND) -+ if (NOT Kdcraw_FIND_QUIETLY) -+ message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}") -+ endif (NOT Kdcraw_FIND_QUIETLY) -+ else (KDCRAW_FOUND) -+ if (Kdcraw_FIND_REQUIRED) -+ if (NOT KDCRAW_INCLUDE_DIR) -+ message(FATAL_ERROR "Could NOT find libkdcraw header files") -+ endif (NOT KDCRAW_INCLUDE_DIR) -+ if (NOT KDCRAW_LIBRARIES) -+ message(FATAL_ERROR "Could NOT find libkdcraw library") -+ endif (NOT KDCRAW_LIBRARIES) -+ endif (Kdcraw_FIND_REQUIRED) -+ endif (KDCRAW_FOUND) -+ -+ MARK_AS_ADVANCED(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES) -+ -+ -+# Find the Kipi module now -+ if(NOT WIN32) -+ message(STATUS "Check Kipi library using pkg-config...") -+ -+ # use pkg-config to get the directories and then use these values -+ # in the FIND_PATH() and FIND_LIBRARY() calls -+ INCLUDE(UsePkgConfig) -+ -+ PKGCONFIG(libkipi-kde4 _KIPIIncDir _KIPILinkDir _KIPILinkFlags _KIPICflags) -+ -+ if(_KIPILinkFlags) -+ # query pkg-config asking for a libkipi >= 0.2.0 -+ exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkipi-kde4 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) -+ if(_return_VALUE STREQUAL "0") -+ message(STATUS "Found libkipi release >= 0.2.0") -+ set(KIPI_VERSION_GOOD_FOUND TRUE) -+ else(_return_VALUE STREQUAL "0") -+ message(STATUS "Found libkipi release < 0.2.0, too old") -+ set(KIPI_VERSION_GOOD_FOUND FALSE) -+ set(KIPI_FOUND FALSE) -+ endif(_return_VALUE STREQUAL "0") -+ else(_KIPILinkFlags) -+ set(KIPI_VERSION_GOOD_FOUND FALSE) -+ set(KIPI_FOUND FALSE) -+ endif(_KIPILinkFlags) -+ else(NOT WIN32) -+ set(KIPI_VERSION_GOOD_FOUND TRUE) -+ endif(NOT WIN32) -+ if(KIPI_VERSION_GOOD_FOUND) -+ set(KIPI_DEFINITIONS ${_KIPICflags}) -+ -+ find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KDE4_INCLUDE_DIR} ${_KIPIIncDir}) -+ find_library(KIPI_LIBRARIES NAMES kipi PATHS ${KDE4_LIB_DIR} ${_KIPILinkDir}) -+ -+ if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES) -+ set(KIPI_FOUND TRUE) -+ endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES) -+ endif(KIPI_VERSION_GOOD_FOUND) -+ if (KIPI_FOUND) -+ if (NOT Kipi_FIND_QUIETLY) -+ message(STATUS "Found libkipi: ${KIPI_LIBRARIES}") -+ endif (NOT Kipi_FIND_QUIETLY) -+ else (KIPI_FOUND) -+ if (Kipi_FIND_REQUIRED) -+ if (NOT KIPI_INCLUDE_DIR) -+ message(FATAL_ERROR "Could NOT find libkipi header files") -+ endif (NOT KIPI_INCLUDE_DIR) -+ if (NOT KIPI_LIBRARIES) -+ message(FATAL_ERROR "Could NOT find libkipi library") -+ endif (NOT KIPI_LIBRARIES) -+ endif (Kipi_FIND_REQUIRED) -+ endif (KIPI_FOUND) -+ -+ MARK_AS_ADVANCED(KIPI_INCLUDE_DIR KIPI_LIBRARIES) -+ -+ # Depencies detection required by all plugins - FIND_PACKAGE(Kexiv2 REQUIRED) - FIND_PACKAGE(Kdcraw REQUIRED) -@@ -62,19 +239,6 @@ - MACRO_OPTIONAL_FIND_PACKAGE(X11) # For Slideshow and ImageViewer. +-FIND_PACKAGE(Kexiv2 REQUIRED) +-FIND_PACKAGE(Kdcraw REQUIRED) +-FIND_PACKAGE(Kipi REQUIRED) + FIND_PACKAGE(JPEG REQUIRED) + FIND_PACKAGE(PNG REQUIRED) + FIND_PACKAGE(TIFF REQUIRED) + ++# Check for KExiv2 ++PKG_CHECK_MODULES(LIBKEXIV2 libkexiv2-kde4>=0.5.0) ++FIND_PATH(KEXIV2_INCLUDE_DIR NAMES libkexiv2/version.h ++ PATHS ${LIBKEXIV2_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH) ++FIND_LIBRARY(KEXIV2_LIBRARY NAMES kexiv2 ++ PATHS ${LIBKEXIV2_LIBRARY_DIRS} ${KDE4_LIB_DIR} NO_DEFAULT_PATH) ++ ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(KEXIV2 DEFAULT_MSG KEXIV2_LIBRARY KEXIV2_INCLUDE_DIR) ++ ++IF(KEXIV2_FOUND) ++ SET(KEXIV2_LIBRARIES ${KEXIV2_LIBRARY}) ++ENDIF(KEXIV2_FOUND) ++ ++# Check for Kdcraw ++PKG_CHECK_MODULES(LIBKDCRAW libkdcraw-kde4>=0.4.0) ++FIND_PATH(KDCRAW_INCLUDE_DIR NAMES libkdcraw/version.h ++ PATHS ${LIBKDCRAW_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH) ++FIND_LIBRARY(KDCRAW_LIBRARY NAMES kdcraw ++ PATHS ${LIBKDCRAW_LIBRARY_DIRS} ${KDE4_LIB_DIR} NO_DEFAULT_PATH) ++ ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(KDCRAW DEFAULT_MSG KDCRAW_LIBRARY KDCRAW_INCLUDE_DIR) ++ ++IF(KDCRAW_FOUND) ++ SET(KDCRAW_LIBRARIES ${KDCRAW_LIBRARY}) ++ SET(KDCRAW_FOR_DNGCONVERTER TRUE) ++ENDIF(KDCRAW_FOUND) ++ ++# Check for Kipi ++PKG_CHECK_MODULES(LIBKIPI libkipi-kde4>=0.2.0) ++FIND_PATH(KIPI_INCLUDE_DIR NAMES libkipi/version.h ++ PATHS ${LIBKIPI_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH) ++FIND_LIBRARY(KIPI_LIBRARY NAMES kipi ++ PATHS ${LIBKIPI_LIBRARY_DIRS} ${KDE4_LIB_DIR} NO_DEFAULT_PATH) ++ ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(KIPI DEFAULT_MSG KIPI_LIBRARY KIPI_INCLUDE_DIR) ++ ++IF(KIPI_FOUND) ++ SET(KIPI_LIBRARIES ${KIPI_LIBRARY}) ++ENDIF(KIPI_FOUND) ++ + # Optional depencies detection required by some plugins + + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) +@@ -63,19 +101,6 @@ + MACRO_OPTIONAL_FIND_PACKAGE(X11) # For AdvancedSlideshow and ImageViewer. ENDIF(NOT WIN32 AND NOT APPLE) -IF(NOT WIN32) diff -ruN kipi-plugins-kde4.orig/files/patch-cmake__modules__FindGdk.cmake kipi-plugins-kde4/files/patch-cmake__modules__FindGdk.cmake --- kipi-plugins-kde4.orig/files/patch-cmake__modules__FindGdk.cmake 1969-12-31 19:00:00.000000000 -0500 +++ kipi-plugins-kde4/files/patch-cmake__modules__FindGdk.cmake 2009-06-08 04:45:00.000000000 -0400 @@ -0,0 +1,48 @@ +--- ./cmake/modules/FindGdk.cmake.orig 2009-03-17 04:52:18.000000000 -0400 ++++ ./cmake/modules/FindGdk.cmake 2009-06-08 04:44:58.000000000 -0400 +@@ -16,33 +16,23 @@ + if(NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls +- INCLUDE(UsePkgConfig) +- +- PKGCONFIG(gdk-pixbuf-2.0 _GDKIncDir _GDKLinkDir _GDKLinkFlags _GDKCflags) +- +- set(GDK_DEFINITIONS ${_GDKCflags}) ++ INCLUDE(FindPkgConfig) ++ PKG_CHECK_MODULES(GDK gdk-pixbuf-2.0) ++ + endif(NOT WIN32) + +- FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h /usr/include/gtk-2.0 +- ${_GDKIncDir} +- ) ++ FIND_PATH(GDK_INCLUDE_DIR NAMES gdk-pixbuf/gdk-pixbuf.h ++ PATHS ${GDK_INCLUDE_DIRS} PATH_SUFFIXES gtk-2.0) + +- FIND_LIBRARY(GDK_LIBRARIES NAMES gdk_pixbuf-2.0 +- PATHS +- ${_GDKLinkDir} +- ) +- +- if (GDK_INCLUDE_DIR AND GDK_LIBRARIES) +- SET(GDK_FOUND TRUE) +- else (GDK_INCLUDE_DIR AND GDK_LIBRARIES) +- SET(GDK_FOUND FALSE) +- endif (GDK_INCLUDE_DIR AND GDK_LIBRARIES) ++ FIND_LIBRARY(GDK_LIBRARY NAMES gdk_pixbuf-2.0 PATHS ${GDK_LIBRARY_DIRS}) + + include(FindPackageHandleStandardArgs) +- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gdk DEFAULT_MSG GDK_INCLUDE_DIR GDK_LIBRARIES ) ++ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gdk DEFAULT_MSG GDK_INCLUDE_DIR GDK_LIBRARY) ++ ++ IF(GDK_FOUND) ++ SET(GDK_LIBRARIES ${GDK_LIBRARY}) ++ ENDIF(GDK_FOUND) + +- MARK_AS_ADVANCED(GDK_INCLUDE_DIR GDK_LIBRARIES) ++ MARK_AS_ADVANCED(GDK_INCLUDE_DIR GDK_LIBRARY) + + endif (GDK_INCLUDE_DIR AND GDK_LIBRARIES) +- +-macro_bool_to_01(GDK_FOUND GDK_FOUND) diff -ruN kipi-plugins-kde4.orig/files/patch-cmake__modules__FindGpod.cmake kipi-plugins-kde4/files/patch-cmake__modules__FindGpod.cmake --- kipi-plugins-kde4.orig/files/patch-cmake__modules__FindGpod.cmake 1969-12-31 19:00:00.000000000 -0500 +++ kipi-plugins-kde4/files/patch-cmake__modules__FindGpod.cmake 2009-06-08 04:45:00.000000000 -0400 @@ -0,0 +1,11 @@ +--- ./cmake/modules/FindGpod.cmake.orig 2009-03-17 04:52:18.000000000 -0400 ++++ ./cmake/modules/FindGpod.cmake 2009-06-08 04:36:50.000000000 -0400 +@@ -24,7 +24,7 @@ + + set(GPOD_DEFINITIONS ${PC_GPOD_CFLAGS_OTHER}) + +- exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.7.0 libgpod-1.0 OUTPUT_VARIABLE _pkgconfigDevNull RETURN_VALUE GPOD_VERSION_OKAY) ++ exec_program(${PKG_CONFIG_EXECUTABLE} ARGS --atleast-version=0.7.0 libgpod-1.0 OUTPUT_VARIABLE _pkgconfigDevNull RETURN_VALUE GPOD_VERSION_OKAY) + + endif( NOT WIN32 ) + diff -ruN kipi-plugins-kde4.orig/files/qt3to4headers.txt kipi-plugins-kde4/files/qt3to4headers.txt --- kipi-plugins-kde4.orig/files/qt3to4headers.txt 1969-12-31 19:00:00.000000000 -0500 +++ kipi-plugins-kde4/files/qt3to4headers.txt 2009-06-08 02:43:32.000000000 -0400 @@ -0,0 +1,46 @@ +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g +s///g diff -ruN kipi-plugins-kde4.orig/pkg-plist kipi-plugins-kde4/pkg-plist --- kipi-plugins-kde4.orig/pkg-plist 2009-06-08 02:26:06.000000000 -0400 +++ kipi-plugins-kde4/pkg-plist 2009-06-09 03:04:30.000000000 -0400 @@ -847,240 +847,10 @@ share/locale/zh_CN/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/zh_CN/LC_MESSAGES/kipiplugin_wallpaper.mo share/locale/zh_CN/LC_MESSAGES/kipiplugins.mo -@dirrmtry share/locale/zh_TW/LC_MESSAGES -@dirrmtry share/locale/zh_TW.Big5/LC_MESSAGES -@dirrmtry share/locale/zh_TW.Big5 -@dirrmtry share/locale/zh_TW -@dirrmtry share/locale/zh_CN/LC_MESSAGES -@dirrmtry share/locale/zh_CN.GB2312/LC_MESSAGES -@dirrmtry share/locale/zh_CN.GB2312 -@dirrmtry share/locale/zh_CN -@dirrmtry share/locale/zh/LC_MESSAGES -@dirrmtry share/locale/zh -@dirrmtry share/locale/wa/LC_MESSAGES -@dirrmtry share/locale/wa -@dirrmtry share/locale/vi/LC_MESSAGES -@dirrmtry share/locale/vi -@dirrmtry share/locale/uz/LC_MESSAGES -@dirrmtry share/locale/uz -@dirrmtry share/locale/uk/LC_MESSAGES -@dirrmtry share/locale/uk -@dirrmtry share/locale/tr/LC_MESSAGES -@dirrmtry share/locale/tr -@dirrmtry share/locale/tk/LC_MESSAGES -@dirrmtry share/locale/tk -@dirrmtry share/locale/th/LC_MESSAGES -@dirrmtry share/locale/th -@dirrmtry share/locale/tg/LC_MESSAGES -@dirrmtry share/locale/tg -@dirrmtry share/locale/ta/LC_MESSAGES -@dirrmtry share/locale/ta -@dirrmtry share/locale/sv/LC_MESSAGES -@dirrmtry share/locale/sv -@dirrmtry share/locale/sr@Latn/LC_MESSAGES -@dirrmtry share/locale/sr@Latn -@dirrmtry share/locale/sr/LC_MESSAGES -@dirrmtry share/locale/sr -@dirrmtry share/locale/sq/LC_MESSAGES -@dirrmtry share/locale/sq -@dirrmtry share/locale/sl/LC_MESSAGES -@dirrmtry share/locale/sl -@dirrmtry share/locale/sk/LC_MESSAGES -@dirrmtry share/locale/sk @dirrmtry share/locale/se/LC_MESSAGES @dirrmtry share/locale/se -@dirrmtry share/locale/ru/LC_MESSAGES -@dirrmtry share/locale/ru -@dirrmtry share/locale/ro/LC_MESSAGES -@dirrmtry share/locale/ro -@dirrmtry share/locale/pt_PT/LC_MESSAGES -@dirrmtry share/locale/pt_PT -@dirrmtry share/locale/pt_BR/LC_MESSAGES -@dirrmtry share/locale/pt_BR -@dirrmtry share/locale/pt/LC_MESSAGES -@dirrmtry share/locale/pt -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl -@dirrmtry share/locale/pa/LC_MESSAGES -@dirrmtry share/locale/pa -@dirrmtry share/locale/or/LC_MESSAGES -@dirrmtry share/locale/or @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc -@dirrmtry share/locale/no/LC_MESSAGES -@dirrmtry share/locale/no -@dirrmtry share/locale/nn/LC_MESSAGES -@dirrmtry share/locale/nn -@dirrmtry share/locale/nl/LC_MESSAGES -@dirrmtry share/locale/nl -@dirrmtry share/locale/ne/LC_MESSAGES -@dirrmtry share/locale/ne -@dirrmtry share/locale/nds/LC_MESSAGES -@dirrmtry share/locale/nds -@dirrmtry share/locale/nb/LC_MESSAGES -@dirrmtry share/locale/nb -@dirrmtry share/locale/mt/LC_MESSAGES -@dirrmtry share/locale/mt -@dirrmtry share/locale/ms/LC_MESSAGES -@dirrmtry share/locale/ms -@dirrmtry share/locale/mn/LC_MESSAGES -@dirrmtry share/locale/mn -@dirrmtry share/locale/ml/LC_MESSAGES -@dirrmtry share/locale/ml -@dirrmtry share/locale/mk/LC_MESSAGES -@dirrmtry share/locale/mk -@dirrmtry share/locale/lv/LC_MESSAGES -@dirrmtry share/locale/lv -@dirrmtry share/locale/lt/LC_MESSAGES -@dirrmtry share/locale/lt -@dirrmtry share/locale/li/LC_MESSAGES -@dirrmtry share/locale/li -@dirrmtry share/locale/ko/LC_MESSAGES -@dirrmtry share/locale/ko -@dirrmtry share/locale/kn/LC_MESSAGES -@dirrmtry share/locale/kn -@dirrmtry share/locale/km/LC_MESSAGES -@dirrmtry share/locale/km -@dirrmtry share/locale/ka/LC_MESSAGES -@dirrmtry share/locale/ka -@dirrmtry share/locale/ja/LC_MESSAGES -@dirrmtry share/locale/ja -@dirrmtry share/locale/it/LC_MESSAGES -@dirrmtry share/locale/it -@dirrmtry share/locale/is/LC_MESSAGES -@dirrmtry share/locale/is -@dirrmtry share/locale/id/LC_MESSAGES -@dirrmtry share/locale/id -@dirrmtry share/locale/hu/LC_MESSAGES -@dirrmtry share/locale/hu -@dirrmtry share/locale/hr/LC_MESSAGES -@dirrmtry share/locale/hr -@dirrmtry share/locale/hi/LC_MESSAGES -@dirrmtry share/locale/hi -@dirrmtry share/locale/he/LC_MESSAGES -@dirrmtry share/locale/he -@dirrmtry share/locale/gu/LC_MESSAGES -@dirrmtry share/locale/gu -@dirrmtry share/locale/gl/LC_MESSAGES -@dirrmtry share/locale/gl -@dirrmtry share/locale/ga/LC_MESSAGES -@dirrmtry share/locale/ga -@dirrmtry share/locale/fr_FR/LC_MESSAGES -@dirrmtry share/locale/fr_FR -@dirrmtry share/locale/fr/LC_MESSAGES -@dirrmtry share/locale/fr -@dirrmtry share/locale/fi/LC_MESSAGES -@dirrmtry share/locale/fi -@dirrmtry share/locale/fa_IR/LC_MESSAGES -@dirrmtry share/locale/fa_IR -@dirrmtry share/locale/fa/LC_MESSAGES -@dirrmtry share/locale/fa -@dirrmtry share/locale/eu/LC_MESSAGES -@dirrmtry share/locale/eu -@dirrmtry share/locale/et/LC_MESSAGES -@dirrmtry share/locale/et -@dirrmtry share/locale/es_MX/LC_MESSAGES -@dirrmtry share/locale/es_MX -@dirrmtry share/locale/es_ES/LC_MESSAGES -@dirrmtry share/locale/es_ES -@dirrmtry share/locale/es/LC_MESSAGES -@dirrmtry share/locale/es -@dirrmtry share/locale/eo/LC_MESSAGES -@dirrmtry share/locale/eo -@dirrmtry share/locale/en_GB/LC_MESSAGES -@dirrmtry share/locale/en_GB -@dirrmtry share/locale/en_CA/LC_MESSAGES -@dirrmtry share/locale/en_CA -@dirrmtry share/locale/en_AU/LC_MESSAGES -@dirrmtry share/locale/en_AU -@dirrmtry share/locale/en/LC_MESSAGES -@dirrmtry share/locale/en -@dirrmtry share/locale/el/LC_MESSAGES -@dirrmtry share/locale/el -@dirrmtry share/locale/ee/LC_MESSAGES -@dirrmtry share/locale/ee -@dirrmtry share/locale/dk/LC_MESSAGES -@dirrmtry share/locale/dk -@dirrmtry share/locale/de_AT/LC_MESSAGES -@dirrmtry share/locale/de_AT -@dirrmtry share/locale/de/LC_MESSAGES -@dirrmtry share/locale/de -@dirrmtry share/locale/da/LC_MESSAGES -@dirrmtry share/locale/da -@dirrmtry share/locale/cy/LC_MESSAGES -@dirrmtry share/locale/cy -@dirrmtry share/locale/cs/LC_MESSAGES -@dirrmtry share/locale/cs -@dirrmtry share/locale/ca/LC_MESSAGES -@dirrmtry share/locale/ca -@dirrmtry share/locale/bs/LC_MESSAGES -@dirrmtry share/locale/bs -@dirrmtry share/locale/br/LC_MESSAGES -@dirrmtry share/locale/br -@dirrmtry share/locale/bn/LC_MESSAGES -@dirrmtry share/locale/bn -@dirrmtry share/locale/bg/LC_MESSAGES -@dirrmtry share/locale/bg -@dirrmtry share/locale/be/LC_MESSAGES -@dirrmtry share/locale/be -@dirrmtry share/locale/az/LC_MESSAGES -@dirrmtry share/locale/az -@dirrmtry share/locale/ar/LC_MESSAGES -@dirrmtry share/locale/ar -@dirrmtry share/locale/am/LC_MESSAGES -@dirrmtry share/locale/am -@dirrmtry share/locale/af/LC_MESSAGES -@dirrmtry share/locale/af -@dirrmtry share/locale -@dirrmtry share/kde4/services -@dirrmtry share/kde4 -@dirrmtry share/java/classes -@dirrmtry share/java -@dirrmtry share/icons/oxygen/scalable/apps -@dirrmtry share/icons/oxygen/scalable -@dirrmtry share/icons/oxygen/64x64/apps -@dirrmtry share/icons/oxygen/64x64 -@dirrmtry share/icons/oxygen/48x48/apps -@dirrmtry share/icons/oxygen/48x48 -@dirrmtry share/icons/oxygen/32x32/apps -@dirrmtry share/icons/oxygen/32x32 -@dirrmtry share/icons/oxygen/22x22/apps -@dirrmtry share/icons/oxygen/22x22 -@dirrmtry share/icons/oxygen/16x16/apps -@dirrmtry share/icons/oxygen/16x16 -@dirrmtry share/icons/hicolor/64x64/actions -@dirrmtry share/icons/hicolor/64x64 -@dirrmtry share/icons/hicolor/32x32/actions -@dirrmtry share/icons/hicolor/32x32 -@dirrmtry share/icons/hicolor/22x22/actions -@dirrmtry share/icons/hicolor/22x22 -@dirrmtry share/icons/hicolor/16x16/actions -@dirrmtry share/icons/hicolor/16x16 -@dirrmtry share/icons/hicolor/128x128/actions -@dirrmtry share/icons/hicolor/128x128 -@dirrmtry share/icons/hicolor -@dirrmtry share/icons -@dirrmtry share/apps/kipiplugin_slideshow -@dirrmtry share/apps/kipiplugin_simpleviewerexport/simpleviewer_html -@dirrmtry share/apps/kipiplugin_simpleviewerexport -@dirrmtry share/apps/kipiplugin_removeredeyes -@dirrmtry share/apps/kipiplugin_metadataedit/data -@dirrmtry share/apps/kipiplugin_metadataedit -@dirrmtry share/apps/kipiplugin_imageviewer/pics -@dirrmtry share/apps/kipiplugin_imageviewer -@dirrmtry share/apps/kipiplugin_htmlexport/themes/snow -@dirrmtry share/apps/kipiplugin_htmlexport/themes/simple -@dirrmtry share/apps/kipiplugin_htmlexport/themes/s0 -@dirrmtry share/apps/kipiplugin_htmlexport/themes/matrix -@dirrmtry share/apps/kipiplugin_htmlexport/themes/frames -@dirrmtry share/apps/kipiplugin_htmlexport/themes/cleanframes -@dirrmtry share/apps/kipiplugin_htmlexport/themes/classic -@dirrmtry share/apps/kipiplugin_htmlexport/themes -@dirrmtry share/apps/kipiplugin_htmlexport -@dirrmtry share/apps/kipiplugin_galleryexport/pics -@dirrmtry share/apps/kipiplugin_galleryexport -@dirrmtry share/apps/kipiplugin_advancedslideshow -@dirrmtry lib/kde4 @dirrm share/apps/kipiplugin_smug/icons/hicolor/scalable/actions @dirrm share/apps/kipiplugin_smug/icons/hicolor/scalable @dirrm share/apps/kipiplugin_smug/icons/hicolor/48x48/actions @@ -1094,6 +864,7 @@ @dirrm share/apps/kipiplugin_smug/icons/hicolor @dirrm share/apps/kipiplugin_smug/icons @dirrm share/apps/kipiplugin_smug +@dirrm share/apps/kipiplugin_removeredeyes @dirrm share/apps/kipiplugin_picasawebexport/icons/hicolor/scalable/actions @dirrm share/apps/kipiplugin_picasawebexport/icons/hicolor/scalable @dirrm share/apps/kipiplugin_picasawebexport/icons/hicolor/48x48/actions @@ -1107,6 +878,21 @@ @dirrm share/apps/kipiplugin_picasawebexport/icons/hicolor @dirrm share/apps/kipiplugin_picasawebexport/icons @dirrm share/apps/kipiplugin_picasawebexport +@dirrm share/apps/kipiplugin_metadataedit/data +@dirrm share/apps/kipiplugin_metadataedit +@dirrm share/apps/kipiplugin_imageviewer/pics +@dirrm share/apps/kipiplugin_imageviewer +@dirrm share/apps/kipiplugin_htmlexport/themes/snow +@dirrm share/apps/kipiplugin_htmlexport/themes/simple +@dirrm share/apps/kipiplugin_htmlexport/themes/s0 +@dirrm share/apps/kipiplugin_htmlexport/themes/matrix +@dirrm share/apps/kipiplugin_htmlexport/themes/frames +@dirrm share/apps/kipiplugin_htmlexport/themes/cleanframes +@dirrm share/apps/kipiplugin_htmlexport/themes/classic +@dirrm share/apps/kipiplugin_htmlexport/themes +@dirrm share/apps/kipiplugin_htmlexport +@dirrm share/apps/kipiplugin_galleryexport/pics +@dirrm share/apps/kipiplugin_galleryexport @dirrm share/apps/kipiplugin_flickrexport/icons/hicolor/scalable/actions @dirrm share/apps/kipiplugin_flickrexport/icons/hicolor/scalable @dirrm share/apps/kipiplugin_flickrexport/icons/hicolor/48x48/actions @@ -1147,3 +933,4 @@ @dirrm share/apps/kipiplugin_facebook/icons/hicolor @dirrm share/apps/kipiplugin_facebook/icons @dirrm share/apps/kipiplugin_facebook +@dirrm share/apps/kipiplugin_advancedslideshow --- 2009-06-09-kipi-plugins-kde4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: