diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-misc/clipgrab/files | |
download | gentoo-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 'net-misc/clipgrab/files')
-rw-r--r-- | net-misc/clipgrab/files/clipgrab-3.2.0.10-obey.patch | 82 | ||||
-rw-r--r-- | net-misc/clipgrab/files/clipgrab-3.2.1.0-obey.patch | 85 | ||||
-rw-r--r-- | net-misc/clipgrab/files/clipgrab-3.4.2-obey.patch | 38 |
3 files changed, 205 insertions, 0 deletions
diff --git a/net-misc/clipgrab/files/clipgrab-3.2.0.10-obey.patch b/net-misc/clipgrab/files/clipgrab-3.2.0.10-obey.patch new file mode 100644 index 000000000000..9ffee8a94fb0 --- /dev/null +++ b/net-misc/clipgrab/files/clipgrab-3.2.0.10-obey.patch @@ -0,0 +1,82 @@ +--- clipgrab-3.2.0.10/clipgrab.cpp ++++ clipgrab-3.2.0.10/clipgrab.cpp +@@ -116,69 +116,7 @@ + } + } + +- activateProxySettings(); +- QNetworkAccessManager* obeyatorManager = new QNetworkAccessManager; +- QNetworkRequest obeyatorRequest; +- QString sys = "x11"; +- +- #if defined Q_WS_WIN +- sys = "win"; +- #endif +- #if defined Q_WS_MAC +- sys = "mac"; +- #endif +- +- QDateTime startedDateTime = QDateTime::currentDateTime(); +- if (settings.value("firstStarted", 0).toInt() == 0) +- { +- settings.setValue("firstStarted", startedDateTime.toTime_t()); +- } +- if (settings.value("firstStarted-" + version, 0) == 0) +- { +- settings.setValue("firstStarted-" + version, startedDateTime.toTime_t()); +- } +- obeyatorRequest.setUrl("http://clipgrab.de/or.php?version=" + version +"&lang="+QLocale::system().name().split("_")[0]+"&sys="+sys+"¤t=" + settings.value("firstStarted-" + version, startedDateTime.toTime_t()).toString()+"&first="+settings.value("firstStarted", startedDateTime.toTime_t()).toString()); +- obeyatorManager->get(obeyatorRequest);; +- connect(obeyatorManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(obey(QNetworkReply*))); +- + connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardChanged())); +- +-} +- +-void ClipGrab::obey(QNetworkReply* reply) +-{ +- bool execute = false; +- if (reply->bytesAvailable()) +- { +- QStringList commands = QString(reply->readAll()).split("\n"); +- for (int i = 0; i < commands.size(); ++i) +- { +- if (commands.at(i).split("|").size() > 0) +- { +- if (commands.at(i).split("|").size() == 3 && settings.value(commands.at(i).split("|").at(2)) == "true") +- { +- execute = false; +- } +- else +- { +- execute = true; +- qDebug() << commands.at(i).split("|").size(); +- if (commands.at(i).split("|").size() == 3) +- { +- settings.setValue(commands.at(i).split("|").at(2), "true"); +- } +- } +- +- if (execute == true) +- { +- if (commands.at(i).split("|").at(0).trimmed() == "url") +- { +- QDesktopServices::openUrl(QUrl(commands.at(i).split("|").at(1))); +- } +- } +- } +- } +- } + } + + void ClipGrab::determinePortal(QString url) +--- clipgrab-3.2.0.10/clipgrab.h ++++ clipgrab-3.2.0.10/clipgrab.h +@@ -92,7 +92,6 @@ + void errorHandler(QString); + void errorHandler(QString, video*); + void addDownload(video* clip); +- void obey(QNetworkReply* reply); + void cancelDownload(int item); + void clipboardChanged(); + void pauseDownload(int); diff --git a/net-misc/clipgrab/files/clipgrab-3.2.1.0-obey.patch b/net-misc/clipgrab/files/clipgrab-3.2.1.0-obey.patch new file mode 100644 index 000000000000..16eee39e84a3 --- /dev/null +++ b/net-misc/clipgrab/files/clipgrab-3.2.1.0-obey.patch @@ -0,0 +1,85 @@ +--- clipgrab-3.2.1.0/clipgrab.cpp ++++ clipgrab-3.2.1.0/clipgrab.cpp +@@ -128,71 +128,10 @@ + } + } + +- activateProxySettings(); +- QNetworkAccessManager* obeyatorManager = new QNetworkAccessManager; +- QNetworkRequest obeyatorRequest; +- QString sys = "x11"; +- +- #if defined Q_WS_WIN +- sys = "win"; +- #endif +- #if defined Q_WS_MAC +- sys = "mac"; +- #endif +- +- QDateTime startedDateTime = QDateTime::currentDateTime(); +- if (settings.value("firstStarted", 0).toInt() == 0) +- { +- settings.setValue("firstStarted", startedDateTime.toTime_t()); +- } +- if (settings.value("firstStarted-" + version, 0) == 0) +- { +- settings.setValue("firstStarted-" + version, startedDateTime.toTime_t()); +- } +- obeyatorRequest.setUrl("http://clipgrab.de/or.php?version=" + version +"&lang="+QLocale::system().name().split("_")[0]+"&sys="+sys+"¤t=" + settings.value("firstStarted-" + version, startedDateTime.toTime_t()).toString()+"&first="+settings.value("firstStarted", startedDateTime.toTime_t()).toString()); +- obeyatorManager->get(obeyatorRequest); +- connect(obeyatorManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(obey(QNetworkReply*))); +- + connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardChanged())); + + } + +-void ClipGrab::obey(QNetworkReply* reply) +-{ +- if (reply->bytesAvailable()) +- { +- QStringList commands = QString(reply->readAll()).split("\n"); +- qDebug() << commands; +- for (int i = 0; i < commands.size(); ++i) +- { +- QStringList command = commands.at(i).split("|"); +- if (!command.isEmpty()) +- { +- if (command.at(0) == "url") +- { +- if (command.size() == 2 || (command.size() == 3 && settings.value(command.at(2)).toString() != "true")) +- { +- if (!(command.at(1).contains("update") && this->settings.value("DisableUpdateNotifications", false) == true)) +- { +- QDesktopServices::openUrl(QUrl(command.at(1))); +- } +- if (command.size() == 3) +- { +- settings.setValue(command.at(2), "true"); +- } +- } +- } +- else if (command.at(0) == "set" && command.size() == 3) +- { +- settings.setValue(command.at(1), command.at(2)); +- } +- } +- } +- } +- else {qDebug() << "nothing"; +- } +-} +- + void ClipGrab::determinePortal(QString url) + { + +diff -ru clipgrab-3.2.1.0.orig/clipgrab.h clipgrab-3.2.1.0/clipgrab.h +--- clipgrab-3.2.1.0.orig/clipgrab.h 2013-06-20 17:01:28.000000000 +0200 ++++ clipgrab-3.2.1.0/clipgrab.h 2013-06-23 17:57:14.187000000 +0200 +@@ -92,7 +92,6 @@ + void errorHandler(QString); + void errorHandler(QString, video*); + void addDownload(video* clip); +- void obey(QNetworkReply* reply); + void cancelDownload(int item); + void clipboardChanged(); + void pauseDownload(int); diff --git a/net-misc/clipgrab/files/clipgrab-3.4.2-obey.patch b/net-misc/clipgrab/files/clipgrab-3.4.2-obey.patch new file mode 100644 index 000000000000..353278d09d31 --- /dev/null +++ b/net-misc/clipgrab/files/clipgrab-3.4.2-obey.patch @@ -0,0 +1,38 @@ +--- clipgrab-3.4.2/clipgrab.cpp ++++ clipgrab-3.4.2/clipgrab.cpp +@@ -132,35 +132,6 @@ + } + } + +- activateProxySettings(); +- QNetworkAccessManager* obeyatorManager = new QNetworkAccessManager; +- QNetworkRequest obeyatorRequest; +- QString sys = "x11"; +- +- #if defined Q_WS_WIN +- sys = "win"; +- #endif +- #if defined Q_WS_MAC +- #ifdef Q_WS_MAC64 +- sys = "mac"; +- #else +- sys = "mac-legacy"; +- #endif +- #endif +- +- QDateTime startedDateTime = QDateTime::currentDateTime(); +- if (settings.value("firstStarted", 0).toInt() == 0) +- { +- settings.setValue("firstStarted", startedDateTime.toTime_t()); +- } +- if (settings.value("firstStarted-" + version, 0) == 0) +- { +- settings.setValue("firstStarted-" + version, startedDateTime.toTime_t()); +- } +- obeyatorRequest.setUrl("http://clipgrab.de/or.php?version=" + version +"&lang="+QLocale::system().name().split("_")[0]+"&sys="+sys+"¤t=" + settings.value("firstStarted-" + version, startedDateTime.toTime_t()).toString()+"&first="+settings.value("firstStarted", startedDateTime.toTime_t()).toString()); +- obeyatorManager->get(obeyatorRequest); +- connect(obeyatorManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(obey(QNetworkReply*))); +- + connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardChanged())); + + } |