[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge] portage/libs/qt5: Add qt 5.6 and adopt patch for 5.6
From:       Patrick von Reth <vonreth () kde ! org>
Date:       2015-10-06 12:50:54
Message-ID: E1ZjRhm-0000jo-NY () scm ! kde ! org
[Download RAW message or body]

Git commit c888a5530f2a3f7a48b00470770129772782b2d1 by Patrick von Reth.
Committed on 06/10/2015 at 12:49.
Pushed by vonreth into branch 'master'.

Add qt 5.6 and adopt patch for 5.6

A  +-    --    portage/libs/qt5/qtbase/qtbase-5.6.patch
M  +25   -18   portage/libs/qt5/qtbase/qtbase.py
M  +2    -2    portage/libs/qt5/version.ini

http://commits.kde.org/emerge/c888a5530f2a3f7a48b00470770129772782b2d1

diff --git a/portage/libs/qt5/qtbase/qtbase-5.6.patch \
b/portage/libs/qt5/qtbase/qtbase-5.6.patch new file mode 100644
index 0000000..191913f
Binary files /dev/null and b/portage/libs/qt5/qtbase/qtbase-5.6.patch differ
diff --git a/portage/libs/qt5/qtbase/qtbase.py b/portage/libs/qt5/qtbase/qtbase.py
index 7f8a1d1..a8b7e27 100644
--- a/portage/libs/qt5/qtbase/qtbase.py
+++ b/portage/libs/qt5/qtbase/qtbase.py
@@ -14,28 +14,35 @@ class subinfo(info.infoclass):
         self.versionInfo.setDefaultValues( )
 
         for ver in self.versionInfo.tarballs():
-            self.patchToApply[ ver ] = [("qtbase-20130714.patch" , 1),]
-           
-            if ver.startswith("5.4"):
-                self.patchToApply[ ver ].append(("qmake-5.4.patch" , 1))
-            if ver.startswith("5.5"):
-                self.patchToApply[ ver ].append(("qmake-5.5.patch" , 1))
+            if ver.startswith("5.6"):
+                self.patchToApply[ ver ] = [("qtbase-5.6.patch" , 1)]
+            else:
+                self.patchToApply[ ver ] = [("qtbase-20130714.patch" , 1),]
+                if ver.startswith("5.4"):
+                    self.patchToApply[ ver ].append(("qmake-5.4.patch" , 1))
+                if ver.startswith("5.5"):
+                    self.patchToApply[ ver ].append(("qmake-5.5.patch" , 1))
+                
             
         for ver in self.versionInfo.branches():
-            self.patchToApply[ ver ] = [("qtbase-20130714.patch" , 1),]
-            
-            if ver.startswith("5.4"):
-                self.patchToApply[ ver ].append(("qmake-5.4.patch" , 1))
-            if ver.startswith("5.5"):
-                self.patchToApply[ ver ].append(("qmake-5.5.patch" , 1))
+            if ver.startswith("5.6"):
+                self.patchToApply[ ver ] = [("qtbase-5.6.patch" , 1)]
+            else:
+                self.patchToApply[ ver ] = [("qtbase-20130714.patch" , 1),]
+                if ver.startswith("5.4"):
+                    self.patchToApply[ ver ].append(("qmake-5.4.patch" , 1))
+                if ver.startswith("5.5"):
+                    self.patchToApply[ ver ].append(("qmake-5.5.patch" , 1))
             
         for ver in self.versionInfo.tags():
-            self.patchToApply[ ver ] = [("qtbase-20130714.patch" , 1),]
-            
-            if ver.startswith("v5.4"):
-                self.patchToApply[ ver ].append(("qmake-5.4.patch" , 1))
-            if ver.startswith("v5.5"):
-                self.patchToApply[ ver ].append(("qmake-5.5.patch" , 1))
+            if ver.startswith("5.6"):
+                self.patchToApply[ ver ] = [("qtbase-5.6.patch" , 1)]
+            else:
+                self.patchToApply[ ver ] = [("qtbase-20130714.patch" , 1),]
+                if ver.startswith("5.4"):
+                    self.patchToApply[ ver ].append(("qmake-5.4.patch" , 1))
+                if ver.startswith("5.5"):
+                    self.patchToApply[ ver ].append(("qmake-5.5.patch" , 1))
         
             
         
diff --git a/portage/libs/qt5/version.ini b/portage/libs/qt5/version.ini
index fa61989..db60f6d 100644
--- a/portage/libs/qt5/version.ini
+++ b/portage/libs/qt5/version.ini
@@ -1,9 +1,9 @@
 [General]
 name=Qt5
 tags = v5.2.1;v5.3.0;v5.3.1;v5.4.0;v5.4.1
-branches = dev;5.3;5.4;5.5
+branches = dev;5.3;5.4;5.5;5.6
 tarballs = 5.2.0;5.2.1;5.3.0;5.3.1;5.3.2;5.4.0;5.4.1;5.4.2
-defaulttarget  = 5.5
+defaulttarget  = 5.5
 tarballUrl = http://download.qt-project.org/official_releases/qt/${VERSION_MAJOR}.${V \
ERSION_MINOR}/${VERSION}/submodules/${PACKAGE_NAME}-opensource-src-${VERSION}.tar.xz  \
tarballDigestUrl = http://download.qt-project.org/official_releases/qt/${VERSION_MAJOR \
}.${VERSION_MINOR}/${VERSION}/submodules/${PACKAGE_NAME}-opensource-src-${VERSION}.tar.xz.sha1
  tarballInstallSrc = ${PACKAGE_NAME}-opensource-src-${VERSION}


[prev in list] [next in list] [prev in thread] [next in thread]