* [gentoo-commits] proj/qt:master commit in: x11-libs/qtsingleapplication/, x11-libs/qtsingleapplication/files/
@ 2013-01-01 19:36 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2013-01-01 19:36 UTC (permalink / raw
To: gentoo-commits
commit: 82a8a69981ec5df58b8f59f8b64c30715b9b0305
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 1 19:32:42 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jan 1 19:32:42 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=82a8a699
[x11-libs/qtsingleapplication] New package wrt bug #441914.
Package-Manager: portage-2.1.11.38
---
x11-libs/qtsingleapplication/Manifest | 1 +
.../files/qtsingleapplication-2.6.1-gcc47.patch | 11 ++++++
x11-libs/qtsingleapplication/metadata.xml | 5 +++
.../qtsingleapplication-2.6.1.ebuild | 35 ++++++++++++++++++++
4 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/x11-libs/qtsingleapplication/Manifest b/x11-libs/qtsingleapplication/Manifest
new file mode 100644
index 0000000..d441812
--- /dev/null
+++ b/x11-libs/qtsingleapplication/Manifest
@@ -0,0 +1 @@
+DIST qtsingleapplication-2.6_1-opensource.tar.gz 92779 SHA256 b0435c9dd2da391ade5686ed75ef0247a1cd341e884d641860bd0f2a70cf1819 SHA512 75ea5f8e860e1e7c7c6989717042c0279a5eb8ba1d1f2ccb8a4ef727d06cb579d4e3aff0557b4f0688ccb5550eff007e8537191c52f84196714ac3fb80d70f5c WHIRLPOOL 9513230e0eddf4ceb65e03692f03ea9ceb192adb06d3a768da0f436f6e2a77b00108d81cb2f933fafb8024f4715d971e755e8a9a8515475fed1707e70475520b
diff --git a/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch b/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch
new file mode 100644
index 0000000..a01143e
--- /dev/null
+++ b/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch
@@ -0,0 +1,11 @@
+diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
+--- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp 2012-01-11 08:15:08.000000000 -0500
++++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp 2012-01-11 08:17:36.874461946 -0500
+@@ -58,6 +58,7 @@ static PProcessIdToSessionId pProcessIdT
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+
+ const char* QtLocalPeer::ack = "ack";
diff --git a/x11-libs/qtsingleapplication/metadata.xml b/x11-libs/qtsingleapplication/metadata.xml
new file mode 100644
index 0000000..ab02f99
--- /dev/null
+++ b/x11-libs/qtsingleapplication/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>qt</herd>
+</pkgmetadata>
diff --git a/x11-libs/qtsingleapplication/qtsingleapplication-2.6.1.ebuild b/x11-libs/qtsingleapplication/qtsingleapplication-2.6.1.ebuild
new file mode 100644
index 0000000..b916028
--- /dev/null
+++ b/x11-libs/qtsingleapplication/qtsingleapplication-2.6.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-r2 versionator
+
+MY_P="${PN}-$(replace_version_separator 2 _)-opensource"
+
+DESCRIPTION="Qt library to start applications only once per user"
+HOMEPAGE="http://doc.qt.digia.com/solutions/4/qtsingleapplication/index.html"
+SRC_URI="http://get.qt.nokia.com/qt/solutions/lgpl/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="x11-libs/qt-core:4
+ x11-libs/qt-gui:4"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${P}-gcc47.patch" )
+
+src_configure() {
+ eqmake4 CONFIG+=qtsingleapplication-uselib
+}
+
+src_install() {
+ dolib.so lib/*
+ doheader src/${PN}.h
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-libs/qtsingleapplication/, x11-libs/qtsingleapplication/files/
@ 2013-01-12 16:40 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2013-01-12 16:40 UTC (permalink / raw
To: gentoo-commits
commit: 21577ffbd17d4943c44218b77794f5568a3cbe30
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 12 16:34:53 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan 12 16:35:57 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=21577ffb
[x11-libs/qtsingleapplication] Unbundle qtlockedfile.
Package-Manager: portage-2.1.11.40
---
.../files/qtsingleapplication-2.6.1-gcc47.patch | 4 +
.../files/qtsingleapplication-2.6.1-unbundle.patch | 77 ++++++++++++++++++++
.../qtsingleapplication-2.6.1.ebuild | 12 +++-
3 files changed, 92 insertions(+), 1 deletions(-)
diff --git a/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch b/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch
index a01143e..003725e 100644
--- a/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch
+++ b/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch
@@ -1,3 +1,7 @@
+Fix build with GCC 4.7.
+
+Source: http://pkgs.fedoraproject.org/cgit/qtsingleapplication.git/tree/qtsingleapplication-gcc47.patch
+
diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
--- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp 2012-01-11 08:15:08.000000000 -0500
+++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp 2012-01-11 08:17:36.874461946 -0500
diff --git a/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch b/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch
new file mode 100644
index 0000000..ef94938
--- /dev/null
+++ b/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch
@@ -0,0 +1,77 @@
+Do not bundle qtlockedfile.
+
+Original source: http://pkgs.fedoraproject.org/cgit/qtsingleapplication.git/tree/qtsingleapplication-dont-bundle-external-libs.patch
+
+diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
+--- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp 2009-12-16 05:43:33.000000000 -0500
++++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp 2010-07-21 22:10:43.000000000 -0400
+@@ -59,15 +59,6 @@ static PProcessIdToSessionId pProcessIdT
+ #include <time.h>
+ #endif
+
+-namespace QtLP_Private {
+-#include "qtlockedfile.cpp"
+-#if defined(Q_OS_WIN)
+-#include "qtlockedfile_win.cpp"
+-#else
+-#include "qtlockedfile_unix.cpp"
+-#endif
+-}
+-
+ const char* QtLocalPeer::ack = "ack";
+
+ QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId)
+@@ -118,7 +109,7 @@ bool QtLocalPeer::isClient()
+ if (lockFile.isLocked())
+ return false;
+
+- if (!lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false))
++ if (!lockFile.lock(QtLockedFile::WriteLock, false))
+ return true;
+
+ bool res = server->listen(socketName);
+diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.h qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h
+--- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.h 2009-12-16 05:43:33.000000000 -0500
++++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h 2010-07-21 22:10:43.000000000 -0400
+@@ -49,9 +49,7 @@
+ #include <QtNetwork/QLocalSocket>
+ #include <QtCore/QDir>
+
+-namespace QtLP_Private {
+ #include "qtlockedfile.h"
+-}
+
+ class QtLocalPeer : public QObject
+ {
+@@ -74,7 +72,7 @@ protected:
+ QString id;
+ QString socketName;
+ QLocalServer* server;
+- QtLP_Private::QtLockedFile lockFile;
++ QtLockedFile lockFile;
+
+ private:
+ static const char* ack;
+diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtsingleapplication.pri qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri
+--- qtsingleapplication-2.6_1-opensource.old/src/qtsingleapplication.pri 2009-12-16 05:43:33.000000000 -0500
++++ qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri 2010-07-21 22:11:08.000000000 -0400
+@@ -2,6 +2,8 @@ include(../common.pri)
+ INCLUDEPATH += $$PWD
+ DEPENDPATH += $$PWD
+ QT *= network
++CONFIG *= qtlockedfile
++LIBS+= -lQtSolutions_LockedFile-2.4
+
+ qtsingleapplication-uselib:!qtsingleapplication-buildlib {
+ LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
+--- a/src/qtsinglecoreapplication.pri
++++ b/src/qtsinglecoreapplication.pri
+@@ -4,6 +4,8 @@
+ SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
+
+ QT *= network
++CONFIG *= qtlockedfile
++LIBS+= -lQtSolutions_LockedFile-2.4
+
+ win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
+ DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)
diff --git a/x11-libs/qtsingleapplication/qtsingleapplication-2.6.1.ebuild b/x11-libs/qtsingleapplication/qtsingleapplication-2.6.1.ebuild
index 2ca5711..9ec3372 100644
--- a/x11-libs/qtsingleapplication/qtsingleapplication-2.6.1.ebuild
+++ b/x11-libs/qtsingleapplication/qtsingleapplication-2.6.1.ebuild
@@ -23,7 +23,17 @@ RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
-PATCHES=( "${FILESDIR}/${P}-gcc47.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-gcc47.patch"
+ "${FILESDIR}/${P}-unbundle.patch"
+)
+
+src_prepare() {
+ qt4-r2_src_prepare
+
+ # to ensure unbundling
+ rm src/qtlockedfile*
+}
src_configure() {
eqmake4 CONFIG+=qtsingleapplication-uselib
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-libs/qtsingleapplication/, x11-libs/qtsingleapplication/files/
@ 2013-09-04 15:00 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2013-09-04 15:00 UTC (permalink / raw
To: gentoo-commits
commit: 38421ef9ca488d445588333cae6a4c4cc2303b04
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 4 14:57:17 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 4 14:57:17 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=38421ef9
[x11-libs/qtsingleapplication] Remove package that is now in the tree.
---
x11-libs/qtsingleapplication/Manifest | 1 -
.../files/qtsingleapplication-2.6.1-gcc47.patch | 15 -----
.../files/qtsingleapplication-2.6.1-unbundle.patch | 77 ----------------------
x11-libs/qtsingleapplication/metadata.xml | 5 --
.../qtsingleapplication-2.6.1.ebuild | 46 -------------
5 files changed, 144 deletions(-)
diff --git a/x11-libs/qtsingleapplication/Manifest b/x11-libs/qtsingleapplication/Manifest
deleted file mode 100644
index d441812..0000000
--- a/x11-libs/qtsingleapplication/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtsingleapplication-2.6_1-opensource.tar.gz 92779 SHA256 b0435c9dd2da391ade5686ed75ef0247a1cd341e884d641860bd0f2a70cf1819 SHA512 75ea5f8e860e1e7c7c6989717042c0279a5eb8ba1d1f2ccb8a4ef727d06cb579d4e3aff0557b4f0688ccb5550eff007e8537191c52f84196714ac3fb80d70f5c WHIRLPOOL 9513230e0eddf4ceb65e03692f03ea9ceb192adb06d3a768da0f436f6e2a77b00108d81cb2f933fafb8024f4715d971e755e8a9a8515475fed1707e70475520b
diff --git a/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch b/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch
deleted file mode 100644
index 003725e..0000000
--- a/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix build with GCC 4.7.
-
-Source: http://pkgs.fedoraproject.org/cgit/qtsingleapplication.git/tree/qtsingleapplication-gcc47.patch
-
-diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
---- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp 2012-01-11 08:15:08.000000000 -0500
-+++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp 2012-01-11 08:17:36.874461946 -0500
-@@ -58,6 +58,7 @@ static PProcessIdToSessionId pProcessIdT
- #endif
- #if defined(Q_OS_UNIX)
- #include <time.h>
-+#include <unistd.h>
- #endif
-
- const char* QtLocalPeer::ack = "ack";
diff --git a/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch b/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch
deleted file mode 100644
index ef94938..0000000
--- a/x11-libs/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Do not bundle qtlockedfile.
-
-Original source: http://pkgs.fedoraproject.org/cgit/qtsingleapplication.git/tree/qtsingleapplication-dont-bundle-external-libs.patch
-
-diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
---- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp 2009-12-16 05:43:33.000000000 -0500
-+++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp 2010-07-21 22:10:43.000000000 -0400
-@@ -59,15 +59,6 @@ static PProcessIdToSessionId pProcessIdT
- #include <time.h>
- #endif
-
--namespace QtLP_Private {
--#include "qtlockedfile.cpp"
--#if defined(Q_OS_WIN)
--#include "qtlockedfile_win.cpp"
--#else
--#include "qtlockedfile_unix.cpp"
--#endif
--}
--
- const char* QtLocalPeer::ack = "ack";
-
- QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId)
-@@ -118,7 +109,7 @@ bool QtLocalPeer::isClient()
- if (lockFile.isLocked())
- return false;
-
-- if (!lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false))
-+ if (!lockFile.lock(QtLockedFile::WriteLock, false))
- return true;
-
- bool res = server->listen(socketName);
-diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.h qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h
---- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.h 2009-12-16 05:43:33.000000000 -0500
-+++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h 2010-07-21 22:10:43.000000000 -0400
-@@ -49,9 +49,7 @@
- #include <QtNetwork/QLocalSocket>
- #include <QtCore/QDir>
-
--namespace QtLP_Private {
- #include "qtlockedfile.h"
--}
-
- class QtLocalPeer : public QObject
- {
-@@ -74,7 +72,7 @@ protected:
- QString id;
- QString socketName;
- QLocalServer* server;
-- QtLP_Private::QtLockedFile lockFile;
-+ QtLockedFile lockFile;
-
- private:
- static const char* ack;
-diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtsingleapplication.pri qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri
---- qtsingleapplication-2.6_1-opensource.old/src/qtsingleapplication.pri 2009-12-16 05:43:33.000000000 -0500
-+++ qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri 2010-07-21 22:11:08.000000000 -0400
-@@ -2,6 +2,8 @@ include(../common.pri)
- INCLUDEPATH += $$PWD
- DEPENDPATH += $$PWD
- QT *= network
-+CONFIG *= qtlockedfile
-+LIBS+= -lQtSolutions_LockedFile-2.4
-
- qtsingleapplication-uselib:!qtsingleapplication-buildlib {
- LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
---- a/src/qtsinglecoreapplication.pri
-+++ b/src/qtsinglecoreapplication.pri
-@@ -4,6 +4,8 @@
- SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
-
- QT *= network
-+CONFIG *= qtlockedfile
-+LIBS+= -lQtSolutions_LockedFile-2.4
-
- win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
- DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)
diff --git a/x11-libs/qtsingleapplication/metadata.xml b/x11-libs/qtsingleapplication/metadata.xml
deleted file mode 100644
index ab02f99..0000000
--- a/x11-libs/qtsingleapplication/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>qt</herd>
-</pkgmetadata>
diff --git a/x11-libs/qtsingleapplication/qtsingleapplication-2.6.1.ebuild b/x11-libs/qtsingleapplication/qtsingleapplication-2.6.1.ebuild
deleted file mode 100644
index 17ce2c3..0000000
--- a/x11-libs/qtsingleapplication/qtsingleapplication-2.6.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit qt4-r2 versionator
-
-MY_P="${PN}-$(replace_version_separator 2 _)-opensource"
-
-DESCRIPTION="Qt library to start applications only once per user"
-HOMEPAGE="http://doc.qt.digia.com/solutions/4/qtsingleapplication/index.html"
-SRC_URI="http://get.qt.nokia.com/qt/solutions/lgpl/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4
- x11-libs/qtlockedfile"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}/${P}-gcc47.patch"
- "${FILESDIR}/${P}-unbundle.patch"
-)
-
-src_prepare() {
- qt4-r2_src_prepare
-
- # to ensure unbundling
- rm src/qtlockedfile*
-}
-
-src_configure() {
- eqmake4 CONFIG+=qtsingleapplication-uselib
-}
-
-src_install() {
- dolib.so lib/*
- doheader src/${PN}.h
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-04 15:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-04 15:00 [gentoo-commits] proj/qt:master commit in: x11-libs/qtsingleapplication/, x11-libs/qtsingleapplication/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2013-01-12 16:40 Michael Palimaka
2013-01-01 19:36 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox