public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/
@ 2015-06-23 12:49 Vladimir Smirnov
  0 siblings, 0 replies; 4+ messages in thread
From: Vladimir Smirnov @ 2015-06-23 12:49 UTC (permalink / raw
  To: gentoo-commits

commit:     496fc27d4dad703180116488ce5cbe95a2cc9f57
Author:     Vladimir Smirnov <civil.over <AT> gmail <DOT> com>
AuthorDate: Tue Jun 23 12:50:39 2015 +0000
Commit:     Vladimir Smirnov <civil <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 12:50:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=496fc27d

Actually add patch for qtwebkit-5.5.0

 dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch
new file mode 100644
index 0000000..583ca6c
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch
@@ -0,0 +1,11 @@
+--- Tools/qmake/mkspecs/features/unix/default_post.prf.bak	2015-06-23 14:45:57.255212841 +0200
++++ Tools/qmake/mkspecs/features/unix/default_post.prf	2015-06-23 14:46:31.703211791 +0200
+@@ -61,8 +61,6 @@
+     }
+ }
+ 
+-contains(TEMPLATE, app): CONFIG += rpath
+-
+ CONFIG(debug, debug|release)|force_debug_info {
+     # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
+     !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/
@ 2016-01-20  5:58 Michael Palimaka
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2016-01-20  5:58 UTC (permalink / raw
  To: gentoo-commits

commit:     012dc5616edd8707d337757314b38657ad3bb149
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 05:58:15 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 05:58:15 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=012dc561

dev-qt/qtwebkit: fix patch format for EAPI 6

Package-Manager: portage-2.2.27

 dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch | 4 ++--
 dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch  | 4 ++--
 dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
index 05e41a1..2309570 100644
--- a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
@@ -1,5 +1,5 @@
---- Tools/qmake/mkspecs/features/features.prf	2014-03-19 18:35:47.795676444 +0000
-+++ Tools/qmake/mkspecs/features/features.prf	2014-03-19 18:36:38.602433220 +0000
+--- a/Tools/qmake/mkspecs/features/features.prf
++++ b/Tools/qmake/mkspecs/features/features.prf
 @@ -99,12 +99,6 @@
  
      # HTML5 Media Support for builds with GStreamer

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
index 1c02e45..8c9220b 100644
--- a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
@@ -1,5 +1,5 @@
---- Tools/qmake/mkspecs/features/features.prf	2014-09-27 11:09:50.010617142 +0100
-+++ Tools/qmake/mkspecs/features/features.prf	2014-09-27 11:17:10.741678989 +0100
+--- a/Tools/qmake/mkspecs/features/features.prf
++++ b/Tools/qmake/mkspecs/features/features.prf
 @@ -96,14 +96,8 @@
      use?(3d_graphics): WEBKIT_CONFIG += webgl
  

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
index 0a476c6..0a68ba7 100644
--- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
@@ -1,7 +1,7 @@
 Correct header location so system dev-libs/leveldb can be detected.
 
---- Tools/qmake/config.tests/leveldb/leveldb.cpp
-+++ Tools/qmake/config.tests/leveldb/leveldb.cpp
+--- a/Tools/qmake/config.tests/leveldb/leveldb.cpp
++++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp
 @@ -19,7 +19,7 @@
  
  #include <leveldb/db.h>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/
@ 2016-01-20  6:00 Michael Palimaka
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2016-01-20  6:00 UTC (permalink / raw
  To: gentoo-commits

commit:     a526afdcc1918130a6ab3be0be43630c339ba735
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 05:59:53 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 05:59:53 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a526afdc

dev-qt/qtwebkit: further EAPI 6 patch format fix

Package-Manager: portage-2.2.27

 dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
index 0a68ba7..265d507 100644
--- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
@@ -12,8 +12,8 @@ Correct header location so system dev-libs/leveldb can be detected.
  int main(int, char**)
  {
 
---- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-+++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
+--- a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
++++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
 @@ -38,7 +38,7 @@
  #include <leveldb/comparator.h>
  #include <leveldb/db.h>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/
  2017-08-27  5:52 [gentoo-commits] proj/qt:qtbase59 " Michael Palimaka
@ 2017-08-27  5:37 ` Michael Palimaka
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2017-08-27  5:37 UTC (permalink / raw
  To: gentoo-commits

commit:     9cb6807005128f41f97023074b3fd07899484c7b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 05:23:48 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 05:37:09 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=9cb68070

dev-qt/qtwebkit: remove unused patch

 .../files/qtwebkit-5.8.0-use-gstreamer010.patch        | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch
deleted file mode 100644
index b286059f..00000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Tools/qmake/mkspecs/features/features.prf
-+++ b/Tools/qmake/mkspecs/features/features.prf
-@@ -99,14 +99,8 @@ defineTest(detectFeatures) {
-     qtConfig(dynamicgl): WEBKIT_CONFIG += have_dynamicgl
- 
-     # HTML5 Media Support for builds with GStreamer
--    unix:!mac:qtConfig(pkg-config) {
--        packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
--            WEBKIT_CONFIG += video use_gstreamer
--        } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
--            WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
--        }
-+        WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
-         use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
--    }
- 
-     !enable?(video):false {
-         WEBKIT_CONFIG += video use_qt_multimedia


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-08-27  5:37 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-23 12:49 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/ Vladimir Smirnov
  -- strict thread matches above, loose matches on Subject: below --
2016-01-20  5:58 Michael Palimaka
2016-01-20  6:00 Michael Palimaka
2017-08-27  5:52 [gentoo-commits] proj/qt:qtbase59 " Michael Palimaka
2017-08-27  5:37 ` [gentoo-commits] proj/qt:master " Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox