Author: craig
Date: Sun Dec 5 12:03:28 2021
New Revision: 24776
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24776
Log:
Update Apple bundle file setup
Bump about date
Modified:
trunk/Scribus/CMakeLists_Apple.cmake
trunk/Scribus/scribus/ui/about.cpp
Modified: trunk/Scribus/CMakeLists_Apple.cmake
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24776&path=/trunk/Scribus/CMakeLists_Apple.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Apple.cmake (original)
+++ trunk/Scribus/CMakeLists_Apple.cmake Sun Dec 5 12:03:28 2021
@@ -123,11 +123,20 @@
endif()
# gcc/mac
if(WANT_UNIVERSAL_BUNDLE)
- message(STATUS "Setting Universal (PPC/i386) Architecture for OSX
Build/Bundle")
- set(CMAKE_OSX_ARCHITECTURES "ppc;i386" )
- set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc;i386" )
- if (WANT_OSX_SDK)
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
+ if (WANT_PPC_I386_BUNDLE)
+ message(STATUS "Setting Universal (PPC/i386) Architecture for
OSX Build/Bundle")
+ set(CMAKE_OSX_ARCHITECTURES "ppc;i386" )
+ set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc;i386" )
+ if (WANT_OSX_SDK)
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
+ endif()
+ else()
+ message(STATUS "Setting Universal (ARM/x64_64) Architecture for
OSX Build/Bundle")
+ set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" )
+ set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "arm64;x86_64" )
+ if (WANT_OSX_SDK)
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
+ endif()
endif()
else()
if(ARCH_PPC OR ARCH_PPC_64)
Modified: trunk/Scribus/scribus/ui/about.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24776&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp (original)
+++ trunk/Scribus/scribus/ui/about.cpp Sun Dec 5 12:03:28 2021
@@ -99,7 +99,6 @@
aboutLayout->setSpacing(6);
aboutLayout->setContentsMargins(9, 9, 9, 9);
tabWidget2 = new QTabWidget( this );
-// tabWidget2->setMinimumSize( QSize( 438, 258 ) );
tab = new QWidget( tabWidget2 );
tabLayout1 = new QVBoxLayout( tab );
tabLayout1->setSpacing(6);
@@ -127,8 +126,8 @@
buildID = new QLabel( tab );
buildID->setAlignment(Qt::AlignCenter);
buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
- QString BUILD_DAY = "24";
- QString BUILD_MONTH = CommonStrings::august;
+ QString BUILD_DAY = "5";
+ QString BUILD_MONTH = CommonStrings::december;
QString BUILD_YEAR = "2021";
QString BUILD_TIME = "";
QString BUILD_TZ = "";
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
