summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-qt/qtsingleapplication
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-qt/qtsingleapplication')
-rw-r--r--dev-qt/qtsingleapplication/Manifest2
-rw-r--r--dev-qt/qtsingleapplication/files/2.6.1_p20130904-no-gui.patch67
-rw-r--r--dev-qt/qtsingleapplication/files/2.6.1_p20130904-unbundle-qtlockedfile.patch81
-rw-r--r--dev-qt/qtsingleapplication/files/qtsingleapplication.prf9
-rw-r--r--dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf8
-rw-r--r--dev-qt/qtsingleapplication/metadata.xml5
-rw-r--r--dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild60
-rw-r--r--dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild96
8 files changed, 328 insertions, 0 deletions
diff --git a/dev-qt/qtsingleapplication/Manifest b/dev-qt/qtsingleapplication/Manifest
new file mode 100644
index 000000000000..d90810f75f22
--- /dev/null
+++ b/dev-qt/qtsingleapplication/Manifest
@@ -0,0 +1,2 @@
+DIST qt-solutions-20130904.tar.xz 751536 SHA256 fc27b49883269a21ced2d3cb543eb78e79223afe5933bbc7d3194146f72f8884 SHA512 9e50d0a7d9fee08a72a3c6dee1d3fe45d04ae0930a967d81eff457f6c0ff53ac8449ef1d8241a5ce75ca2dcf9f4a2fe27b899647748d11060c3ab5767c3d0e75 WHIRLPOOL b933a301de905cffab8393a7adf055ed2f5198f1572657f5993e016746340d9862017982308ac11310add272ae1cd5c3435054dce2dd9d7ee5a9c92baf1878c2
+DIST qt-solutions-20150629.tar.xz 710488 SHA256 cfa88a67c8396878eaa98f39b7648482fabb73988549cc404816c29212cf6503 SHA512 a95ed58f0218cd90d734a40eedd173b896fa0138ad235f3157d7bee538b16c5f385d93bae483fd22267f2984389b9940bb85ba0cd3d25c16124d56abb39568f5 WHIRLPOOL 23a273cfa2d0bc3834487c9e325c73d0038877c5a5085493ceb37ee5dc03cc4d2cddf4f46f5a89045fcbfe7f6dd03b678d56f3167fb750374d44879f11ded8b7
diff --git a/dev-qt/qtsingleapplication/files/2.6.1_p20130904-no-gui.patch b/dev-qt/qtsingleapplication/files/2.6.1_p20130904-no-gui.patch
new file mode 100644
index 000000000000..19019e2892a4
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/2.6.1_p20130904-no-gui.patch
@@ -0,0 +1,67 @@
+From f66352d6c2918123466bd72aee2118b9167562af Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <davidepesa@gmail.com>
+Date: Sat, 28 Dec 2013 16:43:18 +0100
+Subject: [PATCH] no gui
+
+---
+ buildlib/buildlib.pro | 4 +++-
+ src/qtsingleapplication.pri | 11 +++++------
+ src/qtsinglecoreapplication.pri | 2 +-
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/buildlib/buildlib.pro b/buildlib/buildlib.pro
+index 37dddcd..f7c6508 100644
+--- a/buildlib/buildlib.pro
++++ b/buildlib/buildlib.pro
+@@ -2,7 +2,9 @@ TEMPLATE=lib
+ CONFIG += qt dll qtsingleapplication-buildlib
+ mac:CONFIG += absolute_library_soname
+ win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
+-include(../src/qtsingleapplication.pri)
++include(../common.pri)
++include(../src/qtsinglecoreapplication.pri)
++exists(../config.pri):!infile(../config.pri, QTSA_NO_GUI, yes):include(../src/qtsingleapplication.pri)
+ TARGET = $$QTSINGLEAPPLICATION_LIBNAME
+ DESTDIR = $$QTSINGLEAPPLICATION_LIBDIR
+ win32 {
+diff --git a/src/qtsingleapplication.pri b/src/qtsingleapplication.pri
+index 02c9e5b..772924d 100644
+--- a/src/qtsingleapplication.pri
++++ b/src/qtsingleapplication.pri
+@@ -1,15 +1,14 @@
+-include(../common.pri)
+-INCLUDEPATH += $$PWD
+-DEPENDPATH += $$PWD
+-QT *= network
++INCLUDEPATH *= $$PWD
++DEPENDPATH *= $$PWD
++QT *= gui network
+ greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets
+ CONFIG *= qtlockedfile
+
+ qtsingleapplication-uselib:!qtsingleapplication-buildlib {
+ LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
+ } else {
+- SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtlocalpeer.cpp
+- HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtlocalpeer.h
++ SOURCES += $$PWD/qtsingleapplication.cpp
++ HEADERS += $$PWD/qtsingleapplication.h
+ }
+
+ win32 {
+diff --git a/src/qtsinglecoreapplication.pri b/src/qtsinglecoreapplication.pri
+index f5b8414..bf14a3f 100644
+--- a/src/qtsinglecoreapplication.pri
++++ b/src/qtsinglecoreapplication.pri
+@@ -3,7 +3,7 @@ DEPENDPATH += $$PWD
+ HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
+ SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
+
+-QT *= network
++QT = core network
+ CONFIG *= qtlockedfile
+
+ win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
+--
+1.8.5.2
+
diff --git a/dev-qt/qtsingleapplication/files/2.6.1_p20130904-unbundle-qtlockedfile.patch b/dev-qt/qtsingleapplication/files/2.6.1_p20130904-unbundle-qtlockedfile.patch
new file mode 100644
index 000000000000..93c78fab9bab
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/2.6.1_p20130904-unbundle-qtlockedfile.patch
@@ -0,0 +1,81 @@
+From 62210d463f87abb0584ce699915e1845cacaa480 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <davidepesa@gmail.com>
+Date: Sat, 28 Dec 2013 16:33:15 +0100
+Subject: [PATCH] unbundle qtlockedfile
+
+---
+ src/qtlocalpeer.cpp | 11 +----------
+ src/qtlocalpeer.h | 2 +-
+ src/qtsingleapplication.pri | 1 +
+ src/qtsinglecoreapplication.pri | 1 +
+ 4 files changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/src/qtlocalpeer.cpp b/src/qtlocalpeer.cpp
+index 332b064..f17e662 100644
+--- a/src/qtlocalpeer.cpp
++++ b/src/qtlocalpeer.cpp
+@@ -55,15 +55,6 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #include <unistd.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)
+@@ -114,7 +105,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 --git a/src/qtlocalpeer.h b/src/qtlocalpeer.h
+index 1b533b1..1127735 100644
+--- a/src/qtlocalpeer.h
++++ b/src/qtlocalpeer.h
+@@ -68,7 +68,7 @@ protected:
+ QString id;
+ QString socketName;
+ QLocalServer* server;
+- QtLP_Private::QtLockedFile lockFile;
++ QtLockedFile lockFile;
+
+ private:
+ static const char* ack;
+diff --git a/src/qtsingleapplication.pri b/src/qtsingleapplication.pri
+index 6f2bced..02c9e5b 100644
+--- a/src/qtsingleapplication.pri
++++ b/src/qtsingleapplication.pri
+@@ -3,6 +3,7 @@ INCLUDEPATH += $$PWD
+ DEPENDPATH += $$PWD
+ QT *= network
+ greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets
++CONFIG *= qtlockedfile
+
+ qtsingleapplication-uselib:!qtsingleapplication-buildlib {
+ LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
+diff --git a/src/qtsinglecoreapplication.pri b/src/qtsinglecoreapplication.pri
+index d2d6cc3..f5b8414 100644
+--- a/src/qtsinglecoreapplication.pri
++++ b/src/qtsinglecoreapplication.pri
+@@ -4,6 +4,7 @@ HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
+ SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
+
+ QT *= network
++CONFIG *= qtlockedfile
+
+ win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
+ DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)
+--
+1.8.5.2
+
diff --git a/dev-qt/qtsingleapplication/files/qtsingleapplication.prf b/dev-qt/qtsingleapplication/files/qtsingleapplication.prf
new file mode 100644
index 000000000000..3171424fd04f
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/qtsingleapplication.prf
@@ -0,0 +1,9 @@
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
+greaterThan(QT_MAJOR_VERSION, 4) {
+LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication-2.6
+QT *= widgets
+} else {
+LIBS *= -lQtSolutions_SingleApplication-2.6
+}
+QT *= network
+CONFIG *= qtlockedfile
diff --git a/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf b/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf
new file mode 100644
index 000000000000..87d2a9583dbd
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf
@@ -0,0 +1,8 @@
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
+greaterThan(QT_MAJOR_VERSION, 4) {
+LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication-2.6
+} else {
+LIBS *= -lQtSolutions_SingleApplication-2.6
+}
+QT *= network
+CONFIG *= qtlockedfile
diff --git a/dev-qt/qtsingleapplication/metadata.xml b/dev-qt/qtsingleapplication/metadata.xml
new file mode 100644
index 000000000000..ab02f994fdd2
--- /dev/null
+++ b/dev-qt/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/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild
new file mode 100644
index 000000000000..c49a4e453f33
--- /dev/null
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2
+
+MY_P=qt-solutions-${PV#*_p}
+
+DESCRIPTION="Qt library to start applications only once per user"
+HOMEPAGE="https://code.qt.io/cgit/qt-solutions/qt-solutions.git/"
+SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="X doc"
+
+DEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtlockedfile
+ X? ( dev-qt/qtgui:4 )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/${PN}
+
+PATCHES=(
+ "${FILESDIR}/${PV}-unbundle-qtlockedfile.patch"
+ "${FILESDIR}/${PV}-no-gui.patch"
+)
+
+src_prepare() {
+ qt4-r2_src_prepare
+
+ echo 'SOLUTIONS_LIBRARY = yes' > config.pri
+ use X || echo 'QTSA_NO_GUI = yes' >> config.pri
+
+ sed -i -e "s/-head/-${PV%.*}/" common.pri || die
+ sed -i -e '/SUBDIRS+=examples/d' ${PN}.pro || die
+
+ # to ensure unbundling
+ rm -f src/qtlockedfile*
+}
+
+src_install() {
+ dodoc README.TXT
+
+ dolib.so lib/*
+ insinto /usr/include/qt4/QtSolutions
+ doins src/qtsinglecoreapplication.h
+ use X && doins src/{QtSingleApplication,${PN}.h}
+
+ insinto /usr/share/qt4/mkspecs/features
+ doins "${FILESDIR}"/qtsinglecoreapplication.prf
+ use X && doins "${FILESDIR}"/${PN}.prf
+
+ use doc && dohtml -r doc/html
+}
diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild
new file mode 100644
index 000000000000..d8bbdf9753e3
--- /dev/null
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multibuild qmake-utils
+
+MY_P=qt-solutions-${PV#*_p}
+
+DESCRIPTION="Qt library to start applications only once per user"
+HOMEPAGE="https://code.qt.io/cgit/qt-solutions/qt-solutions.git/"
+SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc +qt4 qt5 X"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+DEPEND="
+ dev-qt/qtlockedfile[qt4?,qt5?]
+ qt4? (
+ dev-qt/qtcore:4
+ X? ( dev-qt/qtgui:4 )
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5
+ X? (
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/${PN}
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/2.6.1_p20130904-unbundle-qtlockedfile.patch"
+ epatch "${FILESDIR}/2.6.1_p20130904-no-gui.patch"
+
+ echo 'SOLUTIONS_LIBRARY = yes' > config.pri
+ use X || echo 'QTSA_NO_GUI = yes' >> config.pri
+
+ sed -i -e "s/-head/-${PV%.*}/" common.pri || die
+ sed -i -e '/SUBDIRS+=examples/d' ${PN}.pro || die
+
+ # to ensure unbundling
+ rm -f src/qtlockedfile*
+
+ multibuild_copy_sources
+}
+
+src_configure() {
+ myconfigure() {
+ if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
+ eqmake4
+ fi
+ if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then
+ eqmake5
+ fi
+ }
+ multibuild_foreach_variant run_in_build_dir myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant run_in_build_dir default
+}
+
+src_install() {
+ dodoc README.TXT
+ use doc && dodoc -r doc/html
+
+ myinstall() {
+ # libraries
+ dolib.so lib/*
+
+ # headers
+ insinto "$(${MULTIBUILD_VARIANT}_get_headerdir)"/QtSolutions
+ doins src/qtsinglecoreapplication.h
+ use X && doins src/{QtSingleApplication,${PN}.h}
+
+ # .prf files
+ insinto "$(${MULTIBUILD_VARIANT}_get_mkspecsdir)"/features
+ doins "${FILESDIR}"/qtsinglecoreapplication.prf
+ use X && doins "${FILESDIR}"/${PN}.prf
+ }
+ multibuild_foreach_variant run_in_build_dir myinstall
+}