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

Fix FindTaglib.cmake; nepomuk-core built fine previously only by accident.

Browse Source
This commit is contained in:
zhuk 2014-04-29 09:39:32 +00:00
parent 3d5610e778
commit 55f1ffc530
5 changed files with 11 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/kde4/juk/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2014/02/08 17:26:56 zhuk Exp $
# $OpenBSD: Makefile,v 1.8 2014/04/29 09:39:32 zhuk Exp $
COMMENT = music collection manager and player for KDE
DISTNAME = juk-${MODKDE4_VERSION}
REVISION = 1
REVISION = 2
CATEGORIES = audio
@ -16,6 +16,7 @@ WANTLIB += soprano tag
MODULES = multimedia/phonon
BUILD_DEPENDS = ${MODKDE4_DEP_DIR}/libs,-main>=4.11.5p6
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+2,-guic

29
x11/kde4/juk/patches/patch-coverinfo_cpp
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-coverinfo_cpp,v 1.1 2013/12/08 19:13:29 zhuk Exp $
Fix build.
--- coverinfo.cpp.orig Wed Aug 28 21:09:48 2013
+++ coverinfo.cpp Fri Nov 8 13:30:48 2013
@@ -33,16 +33,16 @@
#include <QImage>
#include <QScopedPointer>
-#include <taglib/mpegfile.h>
-#include <taglib/tstring.h>
-#include <taglib/id3v2tag.h>
-#include <taglib/attachedpictureframe.h>
+#include <mpegfile.h>
+#include <tstring.h>
+#include <id3v2tag.h>
+#include <attachedpictureframe.h>
#ifdef TAGLIB_WITH_MP4
-#include <taglib/mp4coverart.h>
-#include <taglib/mp4file.h>
-#include <taglib/mp4tag.h>
-#include <taglib/mp4item.h>
+#include <mp4coverart.h>
+#include <mp4file.h>
+#include <mp4tag.h>
+#include <mp4item.h>
#endif
#include "mediafiles.h"

13
x11/kde4/juk/patches/patch-tag_cpp
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-tag_cpp,v 1.1 2013/12/08 19:13:29 zhuk Exp $
Fix build.
--- tag.cpp.orig Fri Jun 28 21:40:30 2013
+++ tag.cpp Fri Nov 8 13:30:48 2013
@@ -23,7 +23,7 @@
#include <QtCore/QFile>
-#include <taglib/tag.h>
+#include <tag.h>
#include <tfile.h>
#include <audioproperties.h>
#include <id3v2framefactory.h>

4
x11/kde4/libs/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.48 2014/04/21 17:12:51 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.49 2014/04/29 09:39:32 zhuk Exp $
COMMENT-main = KDE core libraries
COMMENT-en_US = KDE en_US locale data
@ -11,7 +11,7 @@ PKGNAME-langlist = kde4-langlist-${MODKDE4_VERSION}
PKG_ARCH-en_US = *
PKG_ARCH-langlist = *
PKGSPEC-main = kdelibs->=4
REVISION-main = 5
REVISION-main = 6
DPB_PROPERTIES = parallel tag:kde4

11
x11/kde4/libs/patches/patch-cmake_modules_FindTaglib_cmake
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-cmake_modules_FindTaglib_cmake,v 1.1 2014/02/08 16:54:25 zhuk Exp $
$OpenBSD: patch-cmake_modules_FindTaglib_cmake,v 1.2 2014/04/29 09:39:32 zhuk Exp $
Fix Taglib detection, avoiding putting -L/usr/local/lib everywhere.
--- cmake/modules/FindTaglib.cmake.orig Wed Jan 29 13:36:39 2014
+++ cmake/modules/FindTaglib.cmake Wed Jan 29 13:36:48 2014
@@ -10,76 +10,31 @@
+++ cmake/modules/FindTaglib.cmake Thu Mar 13 20:28:07 2014
@@ -10,76 +10,30 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@ -55,12 +55,13 @@ Fix Taglib detection, avoiding putting -L/usr/local/lib everywhere.
- find_path(TAGLIB_INCLUDES
+find_path(TAGLIB_INCLUDES
NAMES
tag.h
PATH_SUFFIXES taglib
- tag.h
- PATH_SUFFIXES taglib
- PATHS
- ${KDE4_INCLUDE_DIR}
- ${INCLUDE_INSTALL_DIR}
- )
+ taglib/tag.h
+ HINTS ${PC_TAGLIB_INCLUDE_DIRS}
+ )