Attachment 114467 Details for Bug 156128 – file.diff

[patch] file.diff

file.diff (text/plain), 5.10 KB, created by Veniamin on 2011-04-02 17:20:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Veniamin

Created: 2011-04-02 17:20:05 UTC

Size: 5.10 KB

patch

obsolete

>diff -ruN tepsonic.orig/Makefile tepsonic/Makefile
>--- tepsonic.orig/Makefile	2011-04-03 00:07:12.000000000 +0800
>+++ tepsonic/Makefile	2011-04-02 22:49:18.000000000 +0800
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	tepsonic
>-PORTVERSION=	0.97.0
>+PORTVERSION=	0.98.2
> CATEGORIES=	audio
> MASTER_SITES=	http://www.tepsonic.org/files/
> DISTNAME=	${PORTNAME}-${PORTVERSION}-src
>@@ -28,4 +28,8 @@
> 
> LICENSE=	GPLv3
> 
>+post-patch:
>+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
>+		${WRKSRC}/3rdparty/qxt/CMakeLists.txt
>+
> .include <bsd.port.mk>
>diff -ruN tepsonic.orig/distinfo tepsonic/distinfo
>--- tepsonic.orig/distinfo	2011-04-03 00:07:12.000000000 +0800
>+++ tepsonic/distinfo	2011-03-30 16:59:29.000000000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (tepsonic-0.97.0-src.tar.gz) = 0e9c115514deb0b7bc94c9382d67ae55abca52fe0661b7141ba5c8ed35835db0
>-SIZE (tepsonic-0.97.0-src.tar.gz) = 679326
>+SHA256 (tepsonic-0.98.2-src.tar.gz) = b7ac029f7979f32441535d5cba10b600eaddaccc6d40682239354fe16c98409a
>+SIZE (tepsonic-0.98.2-src.tar.gz) = 792924
>diff -ruN tepsonic.orig/files/patch-player-3rdparty-CMakeLists.txt tepsonic/files/patch-player-3rdparty-CMakeLists.txt
>--- tepsonic.orig/files/patch-player-3rdparty-CMakeLists.txt	1970-01-01 07:00:00.000000000 +0700
>+++ tepsonic/files/patch-player-3rdparty-CMakeLists.txt	2011-04-02 21:22:11.000000000 +0800
>@@ -0,0 +1,8 @@
>+--- 3rdparty/CMakeLists.txt.orig	2011-04-02 21:21:16.000000000 +0800
>++++ 3rdparty/CMakeLists.txt	2011-04-02 21:21:34.000000000 +0800
>+@@ -1,3 +1,3 @@
>+-if (NOT UNIX OR APPLE)
>++#if (NOT UNIX OR APPLE)
>+ 	add_subdirectory(qxt)
>+-endif (NOT UNIX OR APPLE)
>++#endif (NOT UNIX OR APPLE)
>diff -ruN tepsonic.orig/files/patch-player-3rdparty-qxt-CMakeLists.txt tepsonic/files/patch-player-3rdparty-qxt-CMakeLists.txt
>--- tepsonic.orig/files/patch-player-3rdparty-qxt-CMakeLists.txt	1970-01-01 07:00:00.000000000 +0700
>+++ tepsonic/files/patch-player-3rdparty-qxt-CMakeLists.txt	2011-04-02 22:58:10.000000000 +0800
>@@ -0,0 +1,10 @@
>+--- 3rdparty/qxt/CMakeLists.txt.orig	2011-03-09 05:08:14.000000000 +0700
>++++ 3rdparty/qxt/CMakeLists.txt	2011-04-02 22:57:57.000000000 +0800
>+@@ -1,6 +1,7 @@
>+ cmake_minimum_required(VERSION 2.6)
>+ 
>+ find_package(Qt4 REQUIRED)
>++include_directories(%%LOCALBASE%%/include/)
>+ 
>+ include_directories(
>+         ${QT_INCLUDE_DIR}
>diff -ruN tepsonic.orig/files/patch-player-CMakeLists.txt tepsonic/files/patch-player-CMakeLists.txt
>--- tepsonic.orig/files/patch-player-CMakeLists.txt	1970-01-01 07:00:00.000000000 +0700
>+++ tepsonic/files/patch-player-CMakeLists.txt	2011-04-02 21:25:43.000000000 +0800
>@@ -0,0 +1,27 @@
>+--- player/CMakeLists.txt.orig	2011-04-02 21:22:26.000000000 +0800
>++++ player/CMakeLists.txt	2011-04-02 21:24:51.000000000 +0800
>+@@ -16,20 +16,10 @@ find_package(Taglib REQUIRED)
>+ find_package(Phonon REQUIRED)
>+ 
>+ # Use native libqxt on Linux and patched sources in /3rdparty/qxt on Mac an Win.
>+-if (UNIX AND NOT APPLE)
>+-	set(QXT_USE_QXTCORE TRUE)
>+-	set(QXT_USE_QXTGUI TRUE)
>+-	find_package(Qxt REQUIRED)
>+-	set(QXT_HEADERS "")
>+-	set(QXT_SOURCES "")
>+-else (UNIX AND NOT APPLE)
>+-	add_definitions(-DQXT_STATIC -DBUILD_QXT_GUI -DBUILD_QXT_CORE)
>+-	set(QXT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/qxt)
>+-	set(QXT_LIBRARIES qxt)
>+-        set(QXT_HEADERS "../3rdparty/qxt/qxtglobalshortcuts.h")
>+-	set(QXT_SOURCES "../3rdparty/qxt/qxtglobalshortcuts.cpp")
>+-endif (UNIX AND NOT APPLE)
>+-
>++add_definitions(-DQXT_STATIC -DBUILD_QXT_GUI -DBUILD_QXT_CORE)
>++set(QXT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/qxt)
>++set(QXT_LIBRARIES qxt)
>++set(QXT_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/qxt/qxtglobalshortcut.h)
>+   
>+ 
>+ if (NOT DEFINED CMAKE_BUILD_TYPE)
>diff -ruN tepsonic.orig/files/patch-player-playlist-playlistmodel.cpp tepsonic/files/patch-player-playlist-playlistmodel.cpp
>--- tepsonic.orig/files/patch-player-playlist-playlistmodel.cpp	2011-04-03 00:07:12.000000000 +0800
>+++ tepsonic/files/patch-player-playlist-playlistmodel.cpp	1970-01-01 07:00:00.000000000 +0700
>@@ -1,15 +0,0 @@
>---- player/playlist/playlistmodel.cpp.orig	2010-05-18 02:04:47.000000000 +0800
>-+++ player/playlist/playlistmodel.cpp	2010-05-18 18:11:45.000000000 +0800
>-@@ -21,9 +21,9 @@
>- #include <QtGui>
>- #include <QTime>
>- 
>--#include <taglib/fileref.h>
>--#include <taglib/tag.h>
>--#include <taglib/tstring.h>
>-+#include <fileref.h>
>-+#include <tag.h>
>-+#include <tstring.h>
>- 
>- #include "playlistmodel.h"
>- #include "playlistitem.h"
>diff -ruN tepsonic.orig/files/patch-player-playlist-playlistpopulator.cpp tepsonic/files/patch-player-playlist-playlistpopulator.cpp
>--- tepsonic.orig/files/patch-player-playlist-playlistpopulator.cpp	1970-01-01 07:00:00.000000000 +0700
>+++ tepsonic/files/patch-player-playlist-playlistpopulator.cpp	2011-04-02 21:51:15.000000000 +0800
>@@ -0,0 +1,15 @@
>+--- player/playlist/playlistpopulator.cpp.orig	2011-04-02 21:48:45.000000000 +0800
>++++ player/playlist/playlistpopulator.cpp	2011-04-02 21:49:04.000000000 +0800
>+@@ -31,9 +31,9 @@
>+ #include <QSqlDriver>
>+ #include <QSqlQuery>
>+ 
>+-#include <taglib/taglib.h>
>+-#include <taglib/fileref.h>
>+-#include <taglib/tag.h>
>++#include <taglib.h>
>++#include <fileref.h>
>++#include <tag.h>
>+ 
>+ PlaylistPopulator::PlaylistPopulator()
>+ {

Actions: View | Diff

Attachments on bug 156128: 114467