Update to build and install correctly on at least NetBSD/amd64 5.99.59

This commit is contained in:
David Brownlee 2011-12-27 10:08:50 +00:00 committed by Thomas Klausner
parent 5f22a522f4
commit 1a469abc53
15 changed files with 117 additions and 90 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.28 2011/07/14 12:41:41 mwdavies Exp $
# $NetBSD: Makefile,v 1.29 2011/12/27 10:08:50 absd Exp $
DISTNAME= kde4-4.6.5
CATEGORIES= meta-pkgs x11 kde
@ -9,27 +9,49 @@ MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://www.kde.org/
COMMENT= "meta-package" for the KDE4 integrated X11 desktop
DEPENDS+= oxygen-icons-4.6.5{,nb[0-9]*}:../../graphics/oxygen-icons
DEPENDS+= kdelibs4-4.6.5{,nb[0-9]*}:../../x11/kdelibs4
DEPENDS+= kdepimlibs4-4.6.5{,nb[0-9]*}:../../misc/kdepimlibs4
DEPENDS+= kdebase-runtime4-4.6.5{,nb[0-9]*}:../../x11/kdebase-runtime4
DEPENDS+= kdebase4-4.6.5{,nb[0-9]*}:../../x11/kdebase4
DEPENDS+= kdebase-workspace4-4.6.5{,nb[0-9]*}:../../x11/kdebase-workspace4
DEPENDS+= kdeaccessibility4-4.6.5{,nb[0-9]*}:../../misc/kdeaccessibility4
DEPENDS+= kdeadmin4-4.6.5{,nb[0-9]*}:../../misc/kdeadmin4
DEPENDS+= kdeartwork4-4.6.5{,nb[0-9]*}:../../misc/kdeartwork4
DEPENDS+= kdeedu4-4.6.5{,nb[0-9]*}:../../misc/kdeedu4
DEPENDS+= kdegames4-4.6.5{,nb[0-9]*}:../../games/kdegames4
DEPENDS+= kdegraphics4-4.6.5{,nb[0-9]*}:../../graphics/kdegraphics4
DEPENDS+= kdemultimedia4-4.6.5{,nb[0-9]*}:../../multimedia/kdemultimedia4
DEPENDS+= kdenetwork4-4.6.5{,nb[0-9]*}:../../net/kdenetwork4
DEPENDS+= kdepim4-4.4.11.1{,nb[0-9]*}:../../misc/kdepim4
DEPENDS+= kdepim-runtime4-4.4.11.1{,nb[0-9]*}:../../misc/kdepim-runtime4
DEPENDS+= kdeplasma-addons4-4.6.5{,nb[0-9]*}:../../misc/kdeplasma-addons4
DEPENDS+= kdesdk4-4.6.5{,nb[0-9]*}:../../devel/kdesdk4
DEPENDS+= kdetoys4-4.6.5{,nb[0-9]*}:../../games/kdetoys4
DEPENDS+= kdeutils4-4.6.5{,nb[0-9]*}:../../misc/kdeutils4
DEPENDS+= kdewebdev4-4.6.5{,nb[0-9]*}:../../www/kdewebdev4
# DEPENDS+= oxygen-icons-4.6.5{,nb[0-9]*}:../../graphics/oxygen-icons
# DEPENDS+= kdelibs4-4.6.5{,nb[0-9]*}:../../x11/kdelibs4
# DEPENDS+= kdepimlibs4-4.6.5{,nb[0-9]*}:../../misc/kdepimlibs4
# DEPENDS+= kdebase-runtime4-4.6.5{,nb[0-9]*}:../../x11/kdebase-runtime4
# DEPENDS+= kdebase4-4.6.5{,nb[0-9]*}:../../x11/kdebase4
# DEPENDS+= kdebase-workspace4-4.6.5{,nb[0-9]*}:../../x11/kdebase-workspace4
# DEPENDS+= kdeaccessibility4-4.6.5{,nb[0-9]*}:../../misc/kdeaccessibility4
# DEPENDS+= kdeadmin4-4.6.5{,nb[0-9]*}:../../misc/kdeadmin4
# DEPENDS+= kdeartwork4-4.6.5{,nb[0-9]*}:../../misc/kdeartwork4
# DEPENDS+= kdeedu4-4.6.5{,nb[0-9]*}:../../misc/kdeedu4
# DEPENDS+= kdegames4-4.6.5{,nb[0-9]*}:../../games/kdegames4
# DEPENDS+= kdegraphics4-4.6.5{,nb[0-9]*}:../../graphics/kdegraphics4
# DEPENDS+= kdemultimedia4-4.6.5{,nb[0-9]*}:../../multimedia/kdemultimedia4
# DEPENDS+= kdenetwork4-4.6.5{,nb[0-9]*}:../../net/kdenetwork4
# DEPENDS+= kdepim4-4.4.11.1{,nb[0-9]*}:../../misc/kdepim4
# DEPENDS+= kdepim-runtime4-4.4.11.1{,nb[0-9]*}:../../misc/kdepim-runtime4
# DEPENDS+= kdeplasma-addons4-4.6.5{,nb[0-9]*}:../../misc/kdeplasma-addons4
# DEPENDS+= kdesdk4-4.6.5{,nb[0-9]*}:../../devel/kdesdk4
# DEPENDS+= kdetoys4-4.6.5{,nb[0-9]*}:../../games/kdetoys4
# DEPENDS+= kdeutils4-4.6.5{,nb[0-9]*}:../../misc/kdeutils4
# DEPENDS+= kdewebdev4-4.6.5{,nb[0-9]*}:../../www/kdewebdev4
DEPENDS+= oxygen-icons-4.6.5{,nb[0-9]*}:../../wip/oxygen-icons
DEPENDS+= kdelibs4-4.6.5{,nb[0-9]*}:../../wip/kdelibs4
DEPENDS+= kdepimlibs4-4.6.5{,nb[0-9]*}:../../wip/kdepimlibs4
DEPENDS+= kdebase-runtime4-4.6.5{,nb[0-9]*}:../../wip/kdebase-runtime4
DEPENDS+= kdebase4-4.6.5{,nb[0-9]*}:../../wip/kdebase4
DEPENDS+= kdebase-workspace4-4.6.5{,nb[0-9]*}:../../wip/kdebase-workspace4
DEPENDS+= kdeaccessibility4-4.6.5{,nb[0-9]*}:../../wip/kdeaccessibility4
DEPENDS+= kdeadmin4-4.6.5{,nb[0-9]*}:../../wip/kdeadmin4
DEPENDS+= kdeartwork4-4.6.5{,nb[0-9]*}:../../wip/kdeartwork4
DEPENDS+= kdeedu4-4.6.5{,nb[0-9]*}:../../wip/kdeedu4
DEPENDS+= kdegames4-4.6.5{,nb[0-9]*}:../../wip/kdegames4
DEPENDS+= kdegraphics4-4.6.5{,nb[0-9]*}:../../wip/kdegraphics4
DEPENDS+= kdemultimedia4-4.6.5{,nb[0-9]*}:../../wip/kdemultimedia4
DEPENDS+= kdenetwork4-4.6.5{,nb[0-9]*}:../../wip/kdenetwork4
DEPENDS+= kdepim4-4.4.11.1{,nb[0-9]*}:../../wip/kdepim4
DEPENDS+= kdepim-runtime4-4.4.11.1{,nb[0-9]*}:../../wip/kdepim-runtime4
DEPENDS+= kdeplasma-addons4-4.6.5{,nb[0-9]*}:../../wip/kdeplasma-addons4
DEPENDS+= kdesdk4-4.6.5{,nb[0-9]*}:../../wip/kdesdk4
DEPENDS+= kdetoys4-4.6.5{,nb[0-9]*}:../../wip/kdetoys4
DEPENDS+= kdeutils4-4.6.5{,nb[0-9]*}:../../wip/kdeutils4
DEPENDS+= kdewebdev4-4.6.5{,nb[0-9]*}:../../wip/kdewebdev4
META_PACKAGE= yes

View file

@ -3,9 +3,7 @@ for the K Desktop Environment. Here we have various applications and
infrastructure files and libraries. Here is an overview of the directories:
* drkonqi
If ever an app crashes (heaven forbid!) then Dr.Konqi will be so kind
and make a stack trace. This is a great help for the developers to fix
the bug.
Produces a stack trace for developers if an app crashes.
* kcontrol
The KDE Control Center allows you to tweak the KDE settings.
* kdebugdialog
@ -17,13 +15,10 @@ infrastructure files and libraries. Here is an overview of the directories:
* kfind
File find utility (standalone and in Konqueror's file manager).
* khelpcenter
Used to to read all great documentation about KDE, unix man pages,
info pages etc.
Used to to read all great documentation about KDE, unix man pages, etc
* kioslave
Infrastructure that helps make every application internet enabled
e.g. to directly save a file to ftp://place.org/dir/file.txt
* kreadconfig
A tool for shell scripts to get info from KDE's config files.
* kstart
Launches applications with special window properties such as iconified,
etc.
Launches applications with special window properties such as iconified, etc.

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.14 2011/12/05 10:18:28 thomasklausner Exp $
# $NetBSD: Makefile,v 1.15 2011/12/27 10:08:50 absd Exp $
DISTNAME= kdebase-runtime-${_KDE_VERSION}
PKGREVISION= 1
@ -19,12 +19,13 @@ USE_TOOLS+= gmake
.include "options.mk"
SUBST_CLASSES+= htdig paths
SUBST_CLASSES+= htdig
SUBST_STAGE.htdig= post-patch
SUBST_MESSAGE.htdig= Fix htdig paths.
SUBST_FILES.htdig= khelpcenter/searchhandlers/khc_htsearch.pl
SUBST_SED.htdig= -e s:/srv/www/cgi-bin:${PREFIX}/libexec/cgi-bin:
SUBST_CLASSES+= paths
SUBST_FILES.paths= kioslave/info/kde-info2html.conf
SUBST_SED.paths= -e 's,@LOCALBASE@,${LOCALBASE},g'
SUBST_STAGE.paths= post-patch
@ -45,6 +46,10 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man1
.include "../../wip/kde4/kde4.mk"
.include "../../audio/pulseaudio/buildlink3.mk"
.include "../../audio/libcanberra/buildlink3.mk"
.include "../../security/libssh/buildlink3.mk"
.include "../../wip/phonon/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
.include "../../graphics/exiv2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"

View file

@ -1,7 +1,8 @@
# $NetBSD: options.mk,v 1.3 2011/05/13 23:25:14 mwdavies Exp $
# $NetBSD: options.mk,v 1.4 2011/12/27 10:08:50 absd Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.kdebase-runtime4
PKG_SUPPORTED_OPTIONS= samba alsa
PKG_SUPPORTED_OPTIONS= samba alsa
PKG_DEFAULT_OPTIONS= samba alsa
.include "../../mk/bsd.options.mk"

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.29 2011/05/13 23:25:14 mwdavies Exp $
# $NetBSD: Makefile,v 1.30 2011/12/27 10:08:50 absd Exp $
DISTNAME= kdebase-workspace-${_KDE_VERSION}
CATEGORIES= x11
COMMENT= base workspace for the KDE 4 integrated X11 desktop
COMMENT= Base workspace for the KDE 4 integrated X11 desktop
.include "../../wip/kde4/Makefile.kde4"
@ -54,15 +54,17 @@ PY_PATCHPLIST= yes
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
SUBST_CLASSES+= paths qtpath isocodes
SUBST_CLASSES+= paths
SUBST_FILES.paths= kcontrol/kdm/main.cpp
SUBST_SED.paths= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
SUBST_STAGE.paths= post-patch
SUBST_CLASSES+= qtpath
SUBST_FILES.qtpath= startkde.cmake
SUBST_VARS.qtpath= QTDIR
SUBST_STAGE.qtpath= post-patch
SUBST_CLASSES+= isocodes
SUBST_FILES.isocodes= kcontrol/keyboard/iso_codes.h
SUBST_SED.isocodes= -e 's,/usr/share/xml/iso-codes,${BUILDLINK_PREFIX.iso-codes}/share/xml/iso-codes,g'
SUBST_STAGE.isocodes= post-patch
@ -114,6 +116,7 @@ PYTHON_VERSIONS_ACCEPTED= 27 26 25 # because kdebindings4-python
#.include "../../sysutils/consolekit/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../textproc/iso-codes/buildlink3.mk"
.include "../../wip/phonon/buildlink3.mk"
.include "../../wip/kdebindings4-python/buildlink3.mk"
.include "../../wip/kdelibs4/buildlink3.mk"
.include "../../wip/kdepimlibs4/buildlink3.mk"

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.36 2011/07/14 12:41:41 mwdavies Exp $
$NetBSD: distinfo,v 1.37 2011/12/27 10:08:50 absd Exp $
SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@ -9,9 +9,9 @@ Size (Daemon.png) = 15725 bytes
SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
Size (NetBSD-flag-1.0.png) = 4532 bytes
SHA1 (kdebase-workspace-4.6.5.tar.bz2) = 190a524d57c4e52e69dcc1fc2e5a1c0681239a1c
RMD160 (kdebase-workspace-4.6.5.tar.bz2) = f967475c268e153c03ec33b8b6d303d9e17b4604
Size (kdebase-workspace-4.6.5.tar.bz2) = 69243093 bytes
SHA1 (kdebase-workspace-4.6.5.tar.bz2) = bdcdbf235b3e3941b968f57afd3d490e7ca106e5
RMD160 (kdebase-workspace-4.6.5.tar.bz2) = 580bcfe80aeb70dc7c2ef559338a58c41227e476
Size (kdebase-workspace-4.6.5.tar.bz2) = 69241659 bytes
SHA1 (patch-ab) = 0b0c541c7305d31e01a45f0a6a7f5ddb2d2e57fe
SHA1 (patch-ac) = bb692c83fa189342105744cc9c3c180b970571b7
SHA1 (patch-ad) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2011/05/13 23:25:14 mwdavies Exp $
# $NetBSD: Makefile,v 1.11 2011/12/27 10:08:50 absd Exp $
DISTNAME= kdebase-${_KDE_VERSION}
CATEGORIES= x11
@ -8,8 +8,13 @@ COMMENT= Base modules for the KDE 4 integrated X11 desktop
# BUILD_MAKE_FLAGS+= VERBOSE=1
REPLACE_RUBY+= apps/dolphin/src/khns/servicemenudeinstallation
REPLACE_RUBY+= apps/dolphin/src/khns/servicemenuinstallation
REPLACE_RUBY+= dolphin/src/settings/services/servicemenuinstallation
REPLACE_RUBY+= dolphin/src/settings/services/servicemenudeinstallation
REPLACE_INTERPRETER+= xdg-open
REPLACE.scheme.old= .*/bin/env xdg-open
REPLACE.scheme.new= ${PREFIX}/bin/xdg-open
REPLACE_FILES.scheme= lib/konq/Templates/Program.desktop
.include "../../lang/ruby/replace.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.25 2011/05/23 11:37:08 mwdavies Exp $
# $NetBSD: Makefile,v 1.26 2011/12/27 10:08:50 absd Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
CATEGORIES= x11
@ -16,7 +16,7 @@ CONFLICTS= kdelibs-[0-9]*
CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDELibsDependencies.cmake
CMAKE_DEPENDENCIES_REWRITE+= _KDE_build/KDELibsDependenciesInternal.cmake
CMAKE_MODULE_PATH_OVERRIDE+= kjsembed/qtonly/CMakeLists.txt
CMAKE_MODULE_PATH_OVERRIDE+= kjsembed/qtonly/CMakeLists.txt
CMAKE_ARGS+= -DKDE_DISTRIBUTION_TEXT:STRING="NetBSD pkgsrc"
CMAKE_ARGS+= -DWITH_Avahi:BOOL=off
@ -52,6 +52,13 @@ SUBST_FILES.kdelibsfix= \
kio/kssl/kopenssl.cpp
SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g'
# XXX this is an ugly hack to avoid the WRKDIR path in the installed cmake file
SUBST_CLASSES+= phononrelpath
SUBST_STAGE.phononrelpath= post-configure
SUBST_MESSAGE.phononrelpath= Fixing phonon RELWITHDEBINFO path
SUBST_FILES.phononrelpath= _KDE_build/CMakeFiles/Export/_usr/pkg/share/kde/apps/cmake/modules/KDELibs4LibraryTargets-relwithdebinfo.cmake
SUBST_SED.phononrelpath= -e 's:[^"]*/\.buildlink/lib/libphonon\.so::'
USE_TOOLS+= flex gmake
.include "../../mk/bsd.prefs.mk"
@ -99,6 +106,6 @@ BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.4
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXtst/buildlink3.mk"
.include "../../mk/krb5.buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,6 +1,5 @@
@comment $NetBSD: PLIST,v 1.17 2011/05/13 23:25:15 mwdavies Exp $
@comment $NetBSD: PLIST,v 1.18 2011/12/27 10:08:50 absd Exp $
bin/dragon
bin/juk
bin/kmix
bin/kmixctrl
bin/kscd
@ -38,30 +37,15 @@ lib/libkcompactdisc.so.4.6.0
lib/libkdeinit4_kmix.so
lib/libkdeinit4_kmixctrl.so
share/applications/kde4/dragonplayer.desktop
share/applications/kde4/juk.desktop
share/applications/kde4/kmix.desktop
share/applications/kde4/kscd.desktop
share/dbus-1/interfaces/org.kde.KMix.xml
share/dbus-1/interfaces/org.kde.juk.collection.xml
share/dbus-1/interfaces/org.kde.juk.player.xml
share/dbus-1/interfaces/org.kde.juk.search.xml
share/dbus-1/interfaces/org.kde.kscd.cdplayer.xml
share/doc/kde/HTML/en/dragonplayer/common
share/doc/kde/HTML/en/dragonplayer/index.cache.bz2
share/doc/kde/HTML/en/dragonplayer/index.docbook
share/doc/kde/HTML/en/dragonplayer/main.png
share/doc/kde/HTML/en/dragonplayer/playmedia.png
share/doc/kde/HTML/en/juk/common
share/doc/kde/HTML/en/juk/history-playlist.png
share/doc/kde/HTML/en/juk/index.cache.bz2
share/doc/kde/HTML/en/juk/index.docbook
share/doc/kde/HTML/en/juk/juk-adv-search.png
share/doc/kde/HTML/en/juk/juk-file-renamer.png
share/doc/kde/HTML/en/juk/juk-main.png
share/doc/kde/HTML/en/juk/juk-tag-guesser.png
share/doc/kde/HTML/en/juk/normal-playlist.png
share/doc/kde/HTML/en/juk/search-playlist.png
share/doc/kde/HTML/en/juk/toolbar.png
share/doc/kde/HTML/en/kcontrol/cddbretrieval/common
share/doc/kde/HTML/en/kcontrol/cddbretrieval/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/cddbretrieval/index.docbook
@ -81,24 +65,19 @@ share/doc/kde/HTML/en/kmix/kmix-master.png
share/doc/kde/HTML/en/kmix/kmix-options.png
share/doc/kde/HTML/en/kmix/kmix.png
share/icons/hicolor/128x128/apps/dragonplayer.png
share/icons/hicolor/128x128/apps/juk.png
share/icons/hicolor/128x128/apps/kmix.png
share/icons/hicolor/128x128/apps/kscd.png
share/icons/hicolor/16x16/apps/dragonplayer.png
share/icons/hicolor/16x16/apps/juk.png
share/icons/hicolor/16x16/apps/kmix.png
share/icons/hicolor/16x16/apps/kscd.png
share/icons/hicolor/22x22/apps/dragonplayer.png
share/icons/hicolor/32x32/apps/dragonplayer.png
share/icons/hicolor/32x32/apps/juk.png
share/icons/hicolor/32x32/apps/kmix.png
share/icons/hicolor/32x32/apps/kscd.png
share/icons/hicolor/48x48/apps/dragonplayer.png
share/icons/hicolor/48x48/apps/juk.png
share/icons/hicolor/48x48/apps/kmix.png
share/icons/hicolor/48x48/apps/kscd.png
share/icons/hicolor/64x64/apps/dragonplayer.png
share/icons/hicolor/64x64/apps/juk.png
share/icons/hicolor/64x64/apps/kmix.png
share/icons/hicolor/64x64/apps/kscd.png
share/icons/hicolor/scalable/apps/dragonplayer.svgz
@ -110,12 +89,6 @@ share/icons/oxygen/48x48/actions/player-volume-muted.png
share/icons/oxygen/scalable/actions/player-volume-muted.svgz
share/kde/apps/dragonplayer/dragonlogo.png
share/kde/apps/dragonplayer/dragonplayerui.rc
share/kde/apps/juk/juk.notifyrc
share/kde/apps/juk/jukui-rtl.rc
share/kde/apps/juk/jukui.rc
share/kde/apps/juk/pics/playing.png
share/kde/apps/juk/pics/splash.png
share/kde/apps/juk/pics/yahoo_credit.png
share/kde/apps/kconf_update/audiocd.upd
share/kde/apps/kconf_update/kcmcddb-emailsettings.upd
share/kde/apps/kconf_update/upgrade-metadata.sh
@ -163,7 +136,6 @@ share/kde/config.kcfg/libkcddb.kcfg
share/kde/config.kcfg/mplayerthumbs.kcfg
share/kde/config/dragonplayerrc
share/kde4/services/ServiceMenus/dragonplayer_play_dvd.desktop
share/kde4/services/ServiceMenus/jukservicemenu.desktop
share/kde4/services/audiocd.desktop
share/kde4/services/audiocd.protocol
share/kde4/services/dragonplayer_part.desktop

View file

@ -1,11 +1,12 @@
$NetBSD: distinfo,v 1.27 2011/07/14 12:41:42 mwdavies Exp $
$NetBSD: distinfo,v 1.28 2011/12/27 10:08:50 absd Exp $
SHA1 (kdemultimedia-4.6.5.tar.bz2) = 081bead5ee758d169f3119c138424929b001d04f
RMD160 (kdemultimedia-4.6.5.tar.bz2) = 70ca60910f21e464f49e4e106918fbcc1407b0c7
Size (kdemultimedia-4.6.5.tar.bz2) = 1611493 bytes
SHA1 (patch-CMakeLists.txt) = f12d2d306e821130cb4b8faa554f0758e0d7e723
SHA1 (patch-ac) = aabf99e7f191fb534bf3b202a775b33516d19dbb
SHA1 (patch-ad) = 8901537664189b95f54f06b429362ac15df5afa9
SHA1 (patch-af) = c6ce9d8c45ca25ce5fb9ea8f0e26344cc7c70e15
SHA1 (patch-ad) = 6137e6479ff6b0f16067f88686ae166d7d605f80
SHA1 (patch-af) = c5f9f5a41bc51a7277bb0fbf6a254aa1df75daa3
SHA1 (patch-ag) = d89cfead913fe6fa256f05e0375a053ffd3a691c
SHA1 (patch-ah) = 53ee197c6a39a8b5cae2273dc57bfcfdce281e28
SHA1 (patch-al) = df1832fe6dfd1bb31660a91e32731d0cc14b8f36
SHA1 (patch-ah) = 164e571518a7a9ba31652aeabb745efe23832bc2
SHA1 (patch-al) = 0e883a2b5fab6a0ee2b087bb4868ed634fa5fae4

View file

@ -0,0 +1,16 @@
$NetBSD: patch-CMakeLists.txt,v 1.1 2011/12/27 10:08:50 absd Exp $
Broken version compare semantics means 1.10 is take to be less than 1.6
--- CMakeLists.txt.orig 2011-12-23 08:55:00.000000000 +0000
+++ CMakeLists.txt
@@ -25,7 +25,8 @@ macro_log_feature(SWSCALE_FOUND "swscale
macro_optional_find_package(Xine)
macro_log_feature(XINE_XCB_FOUND "Xine XCB" "Xine libraries" "http://www.xine-project.org/" FALSE "" "Xine and phonon-xine must be compiled with XCB support.")
-macro_optional_find_package(Taglib 1.6)
+# Broken version compare semantics means 1.10 is take to be less than 1.6
+macro_optional_find_package(Taglib 1.10)
macro_log_feature(TAGLIB_FOUND "taglib" "Library for reading and editing audio meta data." "http://ktown.kde.org/~wheeler/taglib/" FALSE "1.6" "Required to build Juk and many Strigi Analyzers.")
macro_optional_find_package(OggVorbis)

View file

@ -1,6 +1,6 @@
$NetBSD: patch-ad,v 1.4 2011/05/13 23:25:15 mwdavies Exp $
$NetBSD: patch-ad,v 1.5 2011/12/27 10:08:50 absd Exp $
--- kmix/tests/CMakeLists.txt.orig 2008-12-22 09:21:07.000000000 +1300
--- kmix/tests/CMakeLists.txt.orig 2011-01-19 22:23:29.000000000 +0000
+++ kmix/tests/CMakeLists.txt
@@ -21,7 +21,7 @@ kde4_add_executable(profiletest ${profil
${kmix_adaptor_SRCS}

View file

@ -1,6 +1,6 @@
$NetBSD: patch-af,v 1.4 2011/05/13 23:25:15 mwdavies Exp $
$NetBSD: patch-af,v 1.5 2011/12/27 10:08:50 absd Exp $
--- kioslave/audiocd/plugins/wav/encodercda.cpp.orig 2008-10-31 02:24:16.000000000 +1300
--- kioslave/audiocd/plugins/wav/encodercda.cpp.orig 2011-01-19 22:23:33.000000000 +0000
+++ kioslave/audiocd/plugins/wav/encodercda.cpp
@@ -44,7 +44,7 @@ extern "C"
{

View file

@ -1,6 +1,6 @@
$NetBSD: patch-ah,v 1.3 2011/05/13 23:25:15 mwdavies Exp $
$NetBSD: patch-ah,v 1.4 2011/12/27 10:08:50 absd Exp $
--- kioslave/audiocd/audiocd.upd.orig 2006-10-26 15:29:33.000000000 +1300
--- kioslave/audiocd/audiocd.upd.orig 2011-01-19 22:23:34.000000000 +0000
+++ kioslave/audiocd/audiocd.upd
@@ -1,4 +1,4 @@
# Update for transport configuration

View file

@ -1,8 +1,8 @@
$NetBSD: patch-al,v 1.5 2011/05/13 23:25:15 mwdavies Exp $
$NetBSD: patch-al,v 1.6 2011/12/27 10:08:50 absd Exp $
--- kioslave/audiocd/CMakeLists.txt.orig 2008-10-18 00:01:46.000000000 +1300
--- kioslave/audiocd/CMakeLists.txt.orig 2011-01-19 22:23:34.000000000 +0000
+++ kioslave/audiocd/CMakeLists.txt
@@ -5,7 +5,7 @@ add_definitions (-DQT3_SUPPORT -DQT3_SUP
@@ -2,7 +2,7 @@ project(audiocd)
MACRO_PUSH_REQUIRED_VARS()
SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/include/cdda)