diff --git a/portage/extragear/kdevelop-plugins/kdev-php/kdev-php.py b/portage/extragear/kdevelop-plugins/kdev-php/kdev-php.py index 03e05dff0..740fd70b0 100644 --- a/portage/extragear/kdevelop-plugins/kdev-php/kdev-php.py +++ b/portage/extragear/kdevelop-plugins/kdev-php/kdev-php.py @@ -1,18 +1,18 @@ import info class subinfo( info.infoclass ): def setTargets( self ): self.svnTargets[ '5.0' ] = '[git]kde:kdev-php|5.0' self.svnTargets[ '5.1' ] = '[git]kde:kdev-php|5.1' self.svnTargets[ 'master' ] = '[git]kde:kdev-php|master' - self.defaultTarget = '5.0' + self.defaultTarget = '5.1' def setDependencies( self ): self.dependencies[ 'extragear/kdevelop-pg-qt' ] = 'default' from Package.CMakePackageBase import * class Package( CMakePackageBase ): def __init__( self): CMakePackageBase.__init__( self ) diff --git a/portage/extragear/kdevelop-plugins/kdev-python/kdev-python.py b/portage/extragear/kdevelop-plugins/kdev-python/kdev-python.py index e1c72e386..6d4a41fb6 100644 --- a/portage/extragear/kdevelop-plugins/kdev-python/kdev-python.py +++ b/portage/extragear/kdevelop-plugins/kdev-python/kdev-python.py @@ -1,21 +1,21 @@ import info class subinfo( info.infoclass ): def setTargets( self ): self.svnTargets['5.0'] = '[git]kde:kdev-python|5.0-python36|' self.svnTargets['5.1'] = '[git]kde:kdev-python|5.1|' - self.defaultTarget = '5.0' + self.defaultTarget = '5.1' def setDependencies( self ): self.shortDescription = "python support for kdevelop" self.buildDependencies['virtual/base'] = 'default' self.dependencies['extragear/kdevplatform'] = 'default' self.dependencies['extragear/kdevelop'] = 'default' self.dependencies['binary/python-libs'] = 'default' from Package.CMakePackageBase import * class Package( CMakePackageBase ): def __init__( self ): CMakePackageBase.__init__( self ) diff --git a/portage/extragear/kdevelop/kdevelop.py b/portage/extragear/kdevelop/kdevelop.py index 64370bac3..699d0736c 100644 --- a/portage/extragear/kdevelop/kdevelop.py +++ b/portage/extragear/kdevelop/kdevelop.py @@ -1,91 +1,91 @@ import info from Packager.NullsoftInstallerPackager import * class subinfo( info.infoclass ): def setTargets( self ): self.svnTargets[ '5.0' ] = '[git]kde:kdevelop|5.0' self.svnTargets[ '5.1' ] = '[git]kde:kdevelop|5.1' self.svnTargets[ 'master' ] = '[git]kde:kdevelop|master' - self.defaultTarget = '5.0' + self.defaultTarget = '5.1' # Note: Don't forget to update this! - self.installerVersion = '5.0.4' + self.installerVersion = '5.1.0' def setDependencies( self ): self.buildDependencies["virtual/base"] = "default" self.buildDependencies["frameworks/extra-cmake-modules"] = "default" self.buildDependencies["dev-util/zip"] = "default" self.dependencies["libs/qtbase"] = "default" self.dependencies["libs/qtdeclarative"] = "default" self.dependencies["libs/qtwebkit"] = "default" self.dependencies[ 'frameworks/karchive' ] = 'default' self.dependencies[ 'frameworks/kconfig' ] = 'default' self.dependencies[ 'frameworks/kguiaddons' ] = 'default' self.dependencies[ 'frameworks/ki18n' ] = 'default' self.dependencies[ 'frameworks/kiconthemes' ] = 'default' self.dependencies[ 'frameworks/kinit' ] = 'default' # runtime dep self.dependencies[ 'frameworks/kitemmodels' ] = 'default' self.dependencies[ 'frameworks/kitemviews' ] = 'default' self.dependencies[ 'frameworks/kjobwidgets' ] = 'default' self.dependencies[ 'frameworks/kcmutils' ] = 'default' self.dependencies[ 'frameworks/knewstuff' ] = 'default' self.dependencies[ 'frameworks/knotifyconfig' ] = 'default' self.dependencies[ 'frameworks/kparts' ] = 'default' self.dependencies[ 'frameworks/kservice' ] = 'default' self.dependencies[ 'frameworks/sonnet' ] = 'default' self.dependencies[ 'frameworks/ktexteditor' ] = 'default' self.dependencies[ 'frameworks/threadweaver' ] = 'default' self.dependencies[ 'frameworks/kwindowsystem' ] = 'default' self.dependencies[ 'frameworks/kxmlgui' ] = 'default' self.dependencies[ 'kde/libkomparediff2' ] = 'default' self.dependencies[ 'data/hicolor-icon-theme'] = "default" self.dependencies[ 'win32libs/clang'] = "default" if self.options.features.fullplasma: self.dependencies[ 'frameworks/krunner' ] = 'default' self.dependencies[ 'frameworks/plasma-framework' ] = 'default' self.dependencies[ 'extragear/kdevplatform' ] = 'default' self.dependencies[ 'extragear/kdevelop-pg-qt' ] = 'default' # Install extra plugins shipped by Kate self.runtimeDependencies[ 'kde/kate' ] = 'default' self.runtimeDependencies[ 'extragear/kdev-python' ] = 'default' self.runtimeDependencies[ 'extragear/kdev-php' ] = 'default' from Package.CMakePackageBase import * class Package( CMakePackageBase ): def __init__( self): CMakePackageBase.__init__( self ) self.blacklist_file = [ NSIPackagerLists.runtimeBlacklist, os.path.join(os.path.dirname(__file__), 'blacklist.txt') ] self.changePackager( NullsoftInstallerPackager ) def createPackage(self): self.defines[ "productname" ] = "KDevelop" self.defines[ "website" ] = "https://kdevelop.org" self.defines[ "executable" ] = "bin\\kdevelop.exe" self.defines[ "icon" ] = os.path.join(os.path.dirname(__file__), "kdevelop.ico") self.defines[ "extrashortcuts" ] = r'CreateShortCut \"${startmenu}\KDevelop - Microsoft Visual C++ compiler.lnk\" \"$INSTDIR\\bin\\kdevelop-msvc.bat\"' self.defines[ "version" ] = self.subinfo.installerVersion self.ignoredPackages.append("binary/mysql-pkg") return TypePackager.createPackage(self) def preArchive(self): archiveDir = self.archiveDir() # TODO: Why is that needed? os.mkdir(os.path.join(archiveDir, "etc", "dbus-1", "session.d")) # TODO: Can we generalize this for other apps? # move everything to the location where Qt expects it binPath = os.path.join(archiveDir, "bin") utils.mergeTree(os.path.join(archiveDir, "plugins"), binPath) utils.mergeTree(os.path.join(archiveDir, "qml"), os.path.join(archiveDir, binPath)) # TODO: Just blacklisting this doesn't work. WTF? utils.rmtree(os.path.join(archiveDir, "dev-utils")) diff --git a/portage/extragear/kdevplatform/kdevplatform.py b/portage/extragear/kdevplatform/kdevplatform.py index 295b607e8..055cdc1ea 100644 --- a/portage/extragear/kdevplatform/kdevplatform.py +++ b/portage/extragear/kdevplatform/kdevplatform.py @@ -1,46 +1,46 @@ import info class subinfo( info.infoclass ): def setTargets( self ): self.svnTargets['5.0'] = '[git]kde:kdevplatform|5.0' self.svnTargets['5.1'] = '[git]kde:kdevplatform|5.1' self.svnTargets['master'] = '[git]kde:kdevplatform|master' self.shortDescription = 'Framework to build IDE-like applications' - self.defaultTarget = '5.0' + self.defaultTarget = '5.1' def setDependencies( self ): self.buildDependencies["virtual/base"] = "default" self.buildDependencies["frameworks/extra-cmake-modules"] = "default" self.buildDependencies["dev-util/zip"] = "default" self.buildDependencies["win32libs/boost-headers"] = "default" self.dependencies["libs/qtscript"] = "default" self.dependencies["libs/qtquickcontrols"] = "default" self.dependencies["libs/qtwebkit"] = "default" self.dependencies["libs/qtbase"] = "default" self.dependencies[ 'frameworks/karchive' ] = 'default' self.dependencies[ 'frameworks/kconfig' ] = 'default' self.dependencies[ 'frameworks/kguiaddons' ] = 'default' self.dependencies[ 'frameworks/ki18n' ] = 'default' self.dependencies[ 'frameworks/kitemmodels' ] = 'default' self.dependencies[ 'frameworks/kitemviews' ] = 'default' self.dependencies[ 'frameworks/kjobwidgets' ] = 'default' self.dependencies[ 'frameworks/kcmutils' ] = 'default' self.dependencies[ 'frameworks/knewstuff' ] = 'default' self.dependencies[ 'frameworks/knotifyconfig' ] = 'default' self.dependencies[ 'frameworks/kparts' ] = 'default' self.dependencies[ 'frameworks/kservice' ] = 'default' self.dependencies[ 'frameworks/sonnet' ] = 'default' self.dependencies[ 'frameworks/ktexteditor' ] = 'default' self.dependencies[ 'frameworks/threadweaver' ] = 'default' self.dependencies[ 'frameworks/kwindowsystem' ] = 'default' self.dependencies[ 'frameworks/kxmlgui' ] = 'default' self.dependencies[ 'frameworks/kdeclarative' ] = 'default' self.dependencies[ 'kde/libkomparediff2' ] = 'default' self.dependencies[ 'kdesupport/grantlee' ] = 'default' from Package.CMakePackageBase import * class Package( CMakePackageBase ): def __init__( self): CMakePackageBase.__init__( self )