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

Reduce linkage: make sure the binaries only link to the libraries

Browse Source 
they really need
This commit is contained in:
dcoppa 2011-10-18 12:17:26 +00:00
parent b0603ce284
commit 67b34b70ac
13 changed files with 159 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/last.fm/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.13 2011/09/19 12:50:57 dcoppa Exp $
# $OpenBSD: Makefile,v 1.14 2011/10/18 12:17:26 dcoppa Exp $
COMMENT = official Last.fm client
VER = 1.5.4.27091
DISTNAME = lastfm-${VER}+dfsg
PKGNAME = last.fm-${VER}
REVISION = 4
REVISION = 5
SHARED_ONLY = Yes

21
audio/last.fm/patches/patch-definitions_pro_inc Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-definitions_pro_inc,v 1.1 2011/10/18 12:17:26 dcoppa Exp $
--- definitions.pro.inc.orig Tue Oct 18 11:16:46 2011
+++ definitions.pro.inc Tue Oct 18 11:17:49 2011
@@ -25,7 +25,7 @@ CONFIG( extension ) {
}
INCLUDEPATH += $$ROOT_DIR/src/libMoose $$ROOT_DIR/src/libUnicorn
-DEPENDPATH += $$ROOT_DIR/src/libUnicorn $$ROOT_DIR/src/libFingerprint
+DEPENDPATH += $$ROOT_DIR/src/libUnicorn
CONFIG(debug, debug|release) {
extension:DESTDIR = $$DESTDIR/debug
@@ -40,8 +40,6 @@ CONFIG(debug, debug|release) {
# FIXME to use proper path
UNICORNPATH = $$ROOT_DIR/src/libUnicorn
include( src/libUnicorn/unicorn.pro.inc )
-
-LIBS += -lMoose$$EXT
# TODO: not sure if this is right now, should probably be determined on a per-plugin basis
plugin:LIBS += -lLastFmTools$$EXT

12
audio/last.fm/patches/patch-src_httpinput_httpinput_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_httpinput_httpinput_cpp,v 1.1 2011/10/18 12:17:26 dcoppa Exp $
--- src/httpinput/httpinput.cpp.orig Tue Oct 18 11:28:20 2011
+++ src/httpinput/httpinput.cpp Tue Oct 18 11:28:31 2011
@@ -21,8 +21,6 @@
#include "httpinput.h"
#include "logger.h"
-#include "WebService.h"
-#include "WebService/Request.h"
#include "RadioEnums.h"
#include "MooseCommon.h"

13
audio/last.fm/patches/patch-src_httpinput_httpinput_pro Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_httpinput_httpinput_pro,v 1.1 2011/10/18 12:17:26 dcoppa Exp $
--- src/httpinput/httpinput.pro.orig Tue Oct 18 11:28:43 2011
+++ src/httpinput/httpinput.pro Tue Oct 18 11:29:17 2011
@@ -1,7 +1,8 @@
TEMPLATE = lib
CONFIG += service
TARGET = httpinput
-QT += network gui xml
+QT += network
+QT -= gui
include( ../../definitions.pro.inc )

14
audio/last.fm/patches/patch-src_libMoose_libMoose_pro
View File

@ -1,10 +1,14 @@
$OpenBSD: patch-src_libMoose_libMoose_pro,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/libMoose/libMoose.pro.orig Tue Nov 2 19:11:04 2010
+++ src/libMoose/libMoose.pro Mon Mar 28 15:20:36 2011
@@ -1,5 +1,5 @@
$OpenBSD: patch-src_libMoose_libMoose_pro,v 1.3 2011/10/18 12:17:26 dcoppa Exp $
--- src/libMoose/libMoose.pro.orig Tue Oct 18 11:12:40 2011
+++ src/libMoose/libMoose.pro Tue Oct 18 11:31:21 2011
@@ -1,8 +1,8 @@
TEMPLATE = lib
-VERSION = 1.0.0
+VERSION = ${LIBMoose_VERSION}.0
CONFIG += dll
TARGET = Moose
QT += xml network gui
-QT += xml network gui
+QT += network gui
include( ../../definitions.pro.inc )

12
audio/last.fm/patches/patch-src_libUnicorn_CachedHttp_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_libUnicorn_CachedHttp_h,v 1.1 2011/10/18 12:17:26 dcoppa Exp $
--- src/libUnicorn/CachedHttp.h.orig Tue Oct 18 11:18:54 2011
+++ src/libUnicorn/CachedHttp.h Tue Oct 18 11:19:34 2011
@@ -26,7 +26,7 @@
#include "UnicornDllExportMacro.h"
#include <QDebug>
-#include <QHttp>
+#include <QtNetwork/QHttp>
#include <QHash>
#include <QStack>
#include <QString>

12
audio/last.fm/patches/patch-src_libUnicorn_Collection_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_libUnicorn_Collection_h,v 1.1 2011/10/18 12:17:26 dcoppa Exp $
--- src/libUnicorn/Collection.h.orig Tue Oct 18 11:21:18 2011
+++ src/libUnicorn/Collection.h Tue Oct 18 11:21:45 2011
@@ -31,7 +31,7 @@
#include <QObject>
#include <QMutex>
-#include <QSqlDatabase>
+#include <QtSql/QSqlDatabase>
/** @author: <chris@last.fm> */

12
audio/last.fm/patches/patch-src_libUnicorn_RedirectHttp_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_libUnicorn_RedirectHttp_h,v 1.1 2011/10/18 12:17:26 dcoppa Exp $
--- src/libUnicorn/RedirectHttp.h.orig Tue Oct 18 11:19:51 2011
+++ src/libUnicorn/RedirectHttp.h Tue Oct 18 11:20:10 2011
@@ -26,7 +26,7 @@
#include "UnicornDllExportMacro.h"
#include <QDebug>
-#include <QHttp>
+#include <QtNetwork/QHttp>
#include <QString>
#include <QHash>

12
audio/last.fm/patches/patch-src_libUnicorn_WebService_Request_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_libUnicorn_WebService_Request_h,v 1.1 2011/10/18 12:17:26 dcoppa Exp $
--- src/libUnicorn/WebService/Request.h.orig Tue Oct 18 11:20:48 2011
+++ src/libUnicorn/WebService/Request.h Tue Oct 18 11:21:07 2011
@@ -31,7 +31,7 @@
#include "WeightedStringList.h"
#include <QTimer>
-#include <QHttpHeader>
+#include <QtNetwork/QHttpHeader>
//TODO mxcl check error handling, since that was the point of all this
//TODO escape query paramaeters in paths in get function

22
audio/last.fm/patches/patch-src_mediadevices_ipod_IpodDevice_cpp
View File

@ -1,7 +1,21 @@
$OpenBSD: patch-src_mediadevices_ipod_IpodDevice_cpp,v 1.1 2011/09/19 12:50:57 dcoppa Exp $
--- src/mediadevices/ipod/IpodDevice.cpp.orig Mon Sep 19 12:48:57 2011
+++ src/mediadevices/ipod/IpodDevice.cpp Mon Sep 19 12:56:29 2011
@@ -78,8 +78,9 @@ IpodDevice::open()
$OpenBSD: patch-src_mediadevices_ipod_IpodDevice_cpp,v 1.2 2011/10/18 12:17:26 dcoppa Exp $
--- src/mediadevices/ipod/IpodDevice.cpp.orig Tue Oct 18 11:12:40 2011
+++ src/mediadevices/ipod/IpodDevice.cpp Tue Oct 18 11:30:05 2011
@@ -24,12 +24,11 @@
#include "logger.h"
-#include <QApplication>
#include <QDateTime>
+#include <QFileInfo>
#include <QSqlError>
#include <QSqlQuery>
#include <QtPlugin>
-#include <QFileDialog>
#include <QSettings>
extern "C"
@@ -78,8 +77,9 @@ IpodDevice::open()
if ( m_uid.isEmpty() )
{

12
audio/last.fm/patches/patch-src_mediadevices_ipod_IpodDevice_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_mediadevices_ipod_IpodDevice_h,v 1.1 2011/10/18 12:17:26 dcoppa Exp $
--- src/mediadevices/ipod/IpodDevice.h.orig Tue Oct 18 11:27:38 2011
+++ src/mediadevices/ipod/IpodDevice.h Tue Oct 18 11:27:51 2011
@@ -22,7 +22,7 @@
#define IPOD_DEVICE_H
#include "TrackInfo.h"
-#include <QSqlDatabase>
+#include <QtSql/QSqlDatabase>
typedef struct _Itdb_iTunesDB Itdb_iTunesDB;
typedef struct _Itdb_Track Itdb_Track;

20
audio/last.fm/patches/patch-src_mediadevices_ipod_ipod_pro
View File

@ -1,10 +1,17 @@
$OpenBSD: patch-src_mediadevices_ipod_ipod_pro,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/mediadevices/ipod/ipod.pro.orig Tue Nov 2 19:10:37 2010
+++ src/mediadevices/ipod/ipod.pro Tue Mar 29 12:27:37 2011
@@ -8,6 +8,14 @@ include( ../../../definitions.pro.inc )
$OpenBSD: patch-src_mediadevices_ipod_ipod_pro,v 1.3 2011/10/18 12:17:26 dcoppa Exp $
--- src/mediadevices/ipod/ipod.pro.orig Tue Oct 18 11:12:40 2011
+++ src/mediadevices/ipod/ipod.pro Tue Oct 18 11:30:25 2011
@@ -2,11 +2,20 @@ TEMPLATE = lib
CONFIG += service
TARGET = Ipod_device
QT += sql
+QT -= gui
include( ../../../definitions.pro.inc )
HEADERS = IpodDevice.h
SOURCES = IpodDevice.cpp
+
+unix:openbsd* {
+ INCLUDEPATH += ${LOCALBASE}/include/gpod-1.0 ${LOCALBASE}/include/glib-2.0 ${LOCALBASE}/lib/glib-2.0/include
+
@ -12,7 +19,6 @@ $OpenBSD: patch-src_mediadevices_ipod_ipod_pro,v 1.2 2011/03/30 14:00:48 dcoppa
+
+ LIBS += -lgpod
+}
+
linux* {
LIBS += -lgpod

21
audio/last.fm/patches/patch-src_src_pro
View File

@ -1,9 +1,11 @@
$OpenBSD: patch-src_src_pro,v 1.3 2011/09/19 12:50:57 dcoppa Exp $
--- src/src.pro.orig Mon Sep 19 12:38:56 2011
+++ src/src.pro Mon Sep 19 12:39:48 2011
@@ -2,15 +2,11 @@ TEMPLATE = app
$OpenBSD: patch-src_src_pro,v 1.4 2011/10/18 12:17:26 dcoppa Exp $
--- src/src.pro.orig Tue Oct 18 11:12:40 2011
+++ src/src.pro Tue Oct 18 11:27:12 2011
@@ -1,16 +1,13 @@
TEMPLATE = app
TARGET = Last.fm
QT += gui network xml sql
-QT += gui network xml sql
+QT += gui network xml
-INCLUDEPATH += lib libFingerprint/recommendation-commons
+INCLUDEPATH += lib
@ -15,10 +17,11 @@ $OpenBSD: patch-src_src_pro,v 1.3 2011/09/19 12:50:57 dcoppa Exp $
- # precompiled headers breaks icecream builds for some reason :(
- system( test `ps aux | grep iceccd | wc -l` -gt 1 ): CONFIG -= precompile_header
-}
+LIBS += -lMoose$$EXT
#universal binaries cannot be built from precompiled headers
mac:release:CONFIG -= precompile_header
@@ -27,17 +23,13 @@ unix:!mac{
@@ -27,17 +24,13 @@ unix:!mac{
include( ../definitions.pro.inc )
@ -38,14 +41,12 @@ $OpenBSD: patch-src_src_pro,v 1.3 2011/09/19 12:50:57 dcoppa Exp $
FORMS = container.ui \
settingsdialog.ui \
settingsdialog_account.ui \
@@ -211,7 +203,9 @@ unix:!mac {
@@ -211,7 +204,7 @@ unix:!mac {
SOURCES += simplewizard_mac.cpp \
winstyleoverrides.cpp
- LIBS += -lmad -lfftw3f
+ QMAKE_LIBDIR += ${LOCALBASE}/lib
+
+ LIBS += -lmad
+ LIBS += -lX11 -lz
HEADERS -= Bootstrapper/iTunesBootstrapper.h \
Bootstrapper/PluginBootstrapper.h