r24830 by craig - Bump versions for trunk to 1.7.0.svn

scribus-commit scribus-commit at lists.scribus.net
Sat Jan 29 13:23:04 UTC 2022


Author: craig
Date: Sat Jan 29 13:23:04 2022
New Revision: 24830

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24830
Log:
Bump versions for trunk to 1.7.0.svn

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/CMakeLists_Dependencies.cmake
    trunk/Scribus/ChangeLog
    trunk/Scribus/OSX-package/inputs/Info.plist
    trunk/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
    trunk/Scribus/Scribus.app/Contents/Info.plist
    trunk/Scribus/config.h.cmake
    trunk/Scribus/scribus.lsm
    trunk/Scribus/scribus/ui/about.cpp

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24830&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Sat Jan 29 13:23:04 2022
@@ -7,11 +7,13 @@
 #Require 3.2.0 for add_custom_target with byproducts
 #Require 3.12 for new Find Python modules
 #Require 3.14 for new Fontconfig module
-
-cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
-if (WANT_QT6)
-	cmake_minimum_required(VERSION 3.16.0)
-endif()
+#Require 3.16 for 1.7.0.svn for Qt 6.2
+
+cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
+#keep just in case this changes
+#if (WANT_QT6)
+#	cmake_minimum_required(VERSION 3.16.0)
+#endif()
 cmake_policy(SET CMP0048 NEW)
 message(STATUS "CMake Version: ${CMAKE_VERSION}")
 if (WANT_PCH)
@@ -30,9 +32,9 @@
 #Final version is ${VERSION} = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUFFIX}
 #where VERSION_SUFFIX is of the form "", "svn" or "Nsvn" (N being the minor patch level)
 set (VERSION_MAJOR "1")
-set (VERSION_MINOR "5")
-set (VERSION_PATCH "8")
-set (VERSION_SUFFIX "")
+set (VERSION_MINOR "7")
+set (VERSION_PATCH "0")
+set (VERSION_SUFFIX "svn")
 set (VERSION ${VERSION_MAJOR})
 if (VERSION_MINOR GREATER -1)
 	set (VERSION ${VERSION}.${VERSION_MINOR})
@@ -395,9 +397,9 @@
 
 #C++11 Support
 #as of 1.5.5.svn, require C++11
-if (WANT_QT6)
-	set (WANT_CPP17 ON)
-endif()
+#if (WANT_QT6)
+set (WANT_CPP17 ON)
+#endif()
 if(NOT WANT_CPP14 AND NOT WANT_CPP17)
 	message(STATUS "Enabling C++11 compiler features")
 	set(CMAKE_CXX_STANDARD 11)
@@ -605,12 +607,12 @@
 	set(CPACK_TOPLEVEL_TAG "")
 	set(CPACK_SOURCE_IGNORE_FILES
 		CMakeCache.txt
-		scribus-1.5.8.tar.bz2
-		scribus-1.5.8.tar.7z
-		scribus-1.5.8.tar.gz
-		scribus-1.5.8.svn.tar.bz2
-		scribus-1.5.8.svn.tar.7z
-		scribus-1.5.8.svn.tar.gz
+		scribus-1.7.0.tar.bz2
+		scribus-1.7.0.tar.7z
+		scribus-1.7.0.tar.gz
+		scribus-1.7.0.svn.tar.bz2
+		scribus-1.7.0.svn.tar.7z
+		scribus-1.7.0.svn.tar.gz
 		"~$"
 		"\\\\.cvsignore$"
 		"\\\\.o$"

Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24830&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake	(original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake	Sat Jan 29 13:23:04 2022
@@ -89,6 +89,9 @@
 	include_directories(${Qt6Network_INCLUDE_DIRS})
 	add_definitions(${Qt6Network_DEFINITIONS})
 
+	find_package(Qt6 COMPONENTS LinguistTools REQUIRED)
+	include_directories(${Qt6LinguistTools_INCLUDE_DIRS})
+	add_definitions(${Qt6LinguistTools_DEFINITIONS})
 
 	#	include_directories(${Qt5Xml_INCLUDE_DIRS})
 #	add_definitions(${Qt5Xml_DEFINITIONS})

Modified: trunk/Scribus/ChangeLog
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24830&path=/trunk/Scribus/ChangeLog
==============================================================================
--- trunk/Scribus/ChangeLog	(original)
+++ trunk/Scribus/ChangeLog	Sat Jan 29 13:23:04 2022
@@ -1,3 +1,10 @@
+Scribus - 1.7.0 (Released 2022-xx-xx)
+=========================================
+Port to Qt6.2
+
+Scribus - 1.5.9 (Released 2022-xx-xx)
+=========================================
+
 Scribus - 1.5.8 (Released 2022-01-23)
 =========================================
 0016726: [General] Duplicate paragraph among linked text frames (jghali)

Modified: trunk/Scribus/OSX-package/inputs/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24830&path=/trunk/Scribus/OSX-package/inputs/Info.plist
==============================================================================
--- trunk/Scribus/OSX-package/inputs/Info.plist	(original)
+++ trunk/Scribus/OSX-package/inputs/Info.plist	Sat Jan 29 13:23:04 2022
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Scribus Installer 1.5.8</string>
+	<string>Scribus Installer 1.7.0.svn</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.scribus.osxinstaller</string>
 	<key>CFBundleName</key>
 	<string>Scribus</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.8</string>
+	<string>1.7.0.svn</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: trunk/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24830&path=/trunk/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist
==============================================================================
--- trunk/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist	(original)
+++ trunk/Scribus/OSX-package/inputs/Scribus.pkg-Info.plist	Sat Jan 29 13:23:04 2022
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Scribus 1.5.8</string>
+	<string>Scribus 1.7.0.svn</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.scribus</string>
 	<key>CFBundleName</key>
 	<string>Scribus</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.8</string>
+	<string>1.7.0.svn</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: trunk/Scribus/Scribus.app/Contents/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24830&path=/trunk/Scribus/Scribus.app/Contents/Info.plist
==============================================================================
--- trunk/Scribus/Scribus.app/Contents/Info.plist	(original)
+++ trunk/Scribus/Scribus.app/Contents/Info.plist	Sat Jan 29 13:23:04 2022
@@ -67,7 +67,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.8</string>
+	<string>1.7.0.svn</string>
 	<key>CFBundleSignature</key>
 	<string>OSCR</string>
 	<key>NSPrincipalClass</key>

Modified: trunk/Scribus/config.h.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24830&path=/trunk/Scribus/config.h.cmake
==============================================================================
--- trunk/Scribus/config.h.cmake	(original)
+++ trunk/Scribus/config.h.cmake	Sat Jan 29 13:23:04 2022
@@ -9,7 +9,7 @@
 #error "Include <scconfig.h> rather than using <config.h> directly"
 #endif
 
-#cmakedefine VERSION "1.5.8"
+#cmakedefine VERSION "1.7.0.svn"
 
 #cmakedefine BUILD_MAC_BUNDLE
 #cmakedefine BUILD_WINDOWS_VERSION 1

Modified: trunk/Scribus/scribus.lsm
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24830&path=/trunk/Scribus/scribus.lsm
==============================================================================
--- trunk/Scribus/scribus.lsm	(original)
+++ trunk/Scribus/scribus.lsm	Sat Jan 29 13:23:04 2022
@@ -1,6 +1,6 @@
 Begin4
 Title:           Scribus 
-Version:         1.5.8
+Version:         1.7.0.svn
 Entered-date:    2003-10-01
 Description:     Scribus is a Page Layout Program for Linux published under the GNU GPL. 
 Keywords:        desktop publishing, page layout, PDF, text processing, graphics, postscript, SVG, EPS 

Modified: trunk/Scribus/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24830&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp	(original)
+++ trunk/Scribus/scribus/ui/about.cpp	Sat Jan 29 13:23:04 2022
@@ -126,7 +126,7 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "23";
+	QString BUILD_DAY = "29";
 	QString BUILD_MONTH = CommonStrings::january;
 	QString BUILD_YEAR = "2022";
 	QString BUILD_TIME = "";




More information about the scribus-commit mailing list