cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split icons off libkdcraw package, to deconflict it with x11/kde4/libkdcraw.

Browse Source 
Also, allow it to build with our make(1).

ok laundry@
This commit is contained in:
zhuk 2013-08-11 12:52:46 +00:00
parent 7627d7ea0c
commit f1eda53d40
6 changed files with 49 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
graphics/libkdcraw/Makefile
View File

@ -1,10 +1,14 @@
# $OpenBSD: Makefile,v 1.15 2013/07/08 21:56:45 zhuk Exp $
# $OpenBSD: Makefile,v 1.16 2013/08/11 12:52:46 zhuk Exp $
COMMENT = grab raw data from digital cameras
COMMENT-main = grab raw data from digital cameras
COMMENT-icons = common icons for all libkdcraw versions
DISTNAME = libkdcraw-0.1.9
REVISION = 5
CATEGORIES = graphics devel
V = 0.1.9
DISTNAME = libkdcraw-${V}
PKGNAME-main = ${PKGNAME}
PKGNAME-icons = libkdcraw-icons-${V}
REVISION-main = 6
HOMEPAGE = http://www.kipi-plugins.org/drupal/
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=kipi/}
@ -24,23 +28,30 @@ CONFIGURE_ENV += ${MODKDE_CONFIGURE_ENV} \
CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
MAKE_FLAGS += ${MODKDE_MAKE_FLAGS}
USE_GMAKE = Yes
LIB_DEPENDS += graphics/lcms \
LIB_DEPENDS-main = ${LIB_DEPENDS} \
graphics/lcms \
x11/kde/libs3
RUN_DEPENDS = graphics/dcraw \
x11/gtk+2,-guic
LIB_DEPENDS-icons =
WANTLIB = GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 drm expat
WANTLIB += fontconfig freetype idn jpeg lcms m mng png stdc++ util xcb
WANTLIB += z
WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdesu
WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient
RUN_DEPENDS-main = graphics/dcraw \
${BUILD_PKGPATH},-icons
RUN_DEPENDS-icons = x11/gtk+2,-guic
WANTLIB-main = ${WANTLIB}
WANTLIB-main += GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
WANTLIB-main += Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 drm expat fam
WANTLIB-main += fontconfig freetype idn jpeg lcms m mng png pthread
WANTLIB-main += pthread-stubs stdc++ util xcb z
WANTLIB-main += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdesu
WANTLIB-main += ${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient
WANTLIB-icons =
# GPL
PERMIT_PACKAGE_CDROM = Yes
MULTI_PACKAGES = -main -icons
MODKDE_LIB_LINKS = Yes
.include <bsd.port.mk>

13
graphics/libkdcraw/patches/patch-libkdcraw_libkdcraw_Makefile_in Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-libkdcraw_libkdcraw_Makefile_in,v 1.1 2013/08/11 12:52:46 zhuk Exp $
GNU Make doesn't fail here, while theoretically should. But our make does.
--- libkdcraw/libkdcraw/Makefile.in.orig Thu Aug 8 16:34:42 2013
+++ libkdcraw/libkdcraw/Makefile.in Thu Aug 8 16:34:57 2013
@@ -784,7 +784,7 @@ libkdcraw_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcd
echo "#define KDE_USE_FINAL 1" >> libkdcraw_la.all_cpp.final; \
for file in kdcraw.cpp kdcrawprivate.cpp dcrawsettingswidget.cpp rnuminput.cpp rcombobox.cpp ; do \
echo "#include \"$$file\"" >> libkdcraw_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdcraw_la.all_cpp.final; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdcraw_la.all_cpp.final || true; \
done; \
cat libkdcraw_la.all_cpp.final libkdcraw_la.all_cpp.files > libkdcraw_la.all_cpp.cpp; \
rm -f libkdcraw_la.all_cpp.final libkdcraw_la.all_cpp.files

2
graphics/libkdcraw/pkg/DESCR-icons Normal file
View File

@ -0,0 +1,2 @@
This package contains icons shared by different versions of libkdcraw (from
KDE 3 and 4) that could be installed simultaneously.

0
graphics/libkdcraw/pkg/DESCR → graphics/libkdcraw/pkg/DESCR-main
View File

7
graphics/libkdcraw/pkg/PLIST-icons Normal file
View File

@ -0,0 +1,7 @@
@comment $OpenBSD: PLIST-icons,v 1.1 2013/08/11 12:52:47 zhuk Exp $
share/icons/hicolor/128x128/apps/kdcraw.png
share/icons/hicolor/32x32/apps/kdcraw.png
share/icons/hicolor/48x48/apps/kdcraw.png
share/icons/hicolor/64x64/apps/kdcraw.png
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor

9
graphics/libkdcraw/pkg/PLIST → graphics/libkdcraw/pkg/PLIST-main
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.7 2013/07/08 21:56:45 zhuk Exp $
@comment $OpenBSD: PLIST-main,v 1.1 2013/08/11 12:52:47 zhuk Exp $
@pkgpath graphics/libkdcraw
include/kde/libkdcraw/
include/kde/libkdcraw/dcrawinfocontainer.h
include/kde/libkdcraw/dcrawsettingswidget.h
@ -13,10 +14,6 @@ include/kde/libkdcraw/version.h
lib/libkdcraw.la
@lib lib/libkdcraw.so.${LIBkdcraw_VERSION}
lib/pkgconfig/libkdcraw.pc
share/icons/hicolor/128x128/apps/kdcraw.png
share/icons/hicolor/32x32/apps/kdcraw.png
share/icons/hicolor/48x48/apps/kdcraw.png
share/icons/hicolor/64x64/apps/kdcraw.png
share/locale/ca/LC_MESSAGES/libkdcraw.mo
share/locale/da/LC_MESSAGES/libkdcraw.mo
share/locale/de/LC_MESSAGES/libkdcraw.mo
@ -40,5 +37,3 @@ share/locale/sr@Latn/LC_MESSAGES/libkdcraw.mo
share/locale/sv/LC_MESSAGES/libkdcraw.mo
share/locale/th/LC_MESSAGES/libkdcraw.mo
share/locale/uk/LC_MESSAGES/libkdcraw.mo
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor