gentoo auto-resync : 01:01:2024 - 11:53:34

7 files changed, 27 insertions, 15 deletions

diff --git a/app-office/scribus/files/scribus-1.5.3-fpic.patch b/app-office/scribus/files/scribus-1.5.3-fpic.patch
index ba0721955ef8..bb4378e5effa 100644
--- a/app-office/scribus/files/scribus-1.5.3-fpic.patch
+++ b/app-office/scribus/files/scribus-1.5.3-fpic.patch
@@ -1,8 +1,6 @@
  scribus/third_party/prc/CMakeLists.txt | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt
-index 5f7c2c6..1da7177 100644
 --- a/scribus/third_party/prc/CMakeLists.txt
 +++ b/scribus/third_party/prc/CMakeLists.txt
 @@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR}
diff --git a/app-office/scribus/files/scribus-1.5.6-docdir.patch b/app-office/scribus/files/scribus-1.5.6-docdir.patch
index 957991c2acc4..06d878af55fd 100644
--- a/app-office/scribus/files/scribus-1.5.6-docdir.patch
+++ b/app-office/scribus/files/scribus-1.5.6-docdir.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists_Directories.cmake b/CMakeLists_Directories.cmake
-index db6133f..faf85ce 100644
 --- a/CMakeLists_Directories.cmake
 +++ b/CMakeLists_Directories.cmake
 @@ -36,14 +36,16 @@ else()
diff --git a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
index 3123ce4477c9..d8e2400ea1f4 100644
--- a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
+++ b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
@@ -1,5 +1,5 @@
---- a/CMakeLists_Dependencies.cmake	2019-07-31 00:34:43.000000000 +0200
-+++ b/CMakeLists_Dependencies.cmake	2019-10-02 00:17:34.968355656 +0200
+--- a/CMakeLists_Dependencies.cmake
++++ b/CMakeLists_Dependencies.cmake
 @@ -954,6 +954,16 @@
  endif()
  #>>HUNSPELL for Speelling support
diff --git a/app-office/scribus/files/scribus-1.5.8-cmake.patch b/app-office/scribus/files/scribus-1.5.8-cmake.patch
index a461ee20c281..6ddd76912dbe 100644
--- a/app-office/scribus/files/scribus-1.5.8-cmake.patch
+++ b/app-office/scribus/files/scribus-1.5.8-cmake.patch
@@ -1,5 +1,5 @@
---- a/CMakeLists.txt	2022-01-23 17:14:43.000000000 +0100
-+++ b/CMakeLists.txt	2023-02-05 15:59:57.828047452 +0100
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -362,25 +362,6 @@
  if(APPLE)
  	### Include our Apple configure commands
diff --git a/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch b/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch
index 39a11b0ee4a9..e199c488c020 100644
--- a/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch
+++ b/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch
@@ -1,5 +1,3 @@
-diff --git a/scribus/CMakeLists.txt b/scribus/CMakeLists.txt
-index aec69d3..9451404 100644
 --- a/scribus/CMakeLists.txt
 +++ b/scribus/CMakeLists.txt
 @@ -587,7 +587,9 @@ set(SCRIBUS_SOURCES
@@ -39,8 +37,6 @@ index aec69d3..9451404 100644
  if(WIN32)
  	set_target_properties(${EXE_NAME}
  		PROPERTIES
-diff --git a/scribus/hyphenator.h b/scribus/hyphenator.h
-index 7fa4abd..2863c70 100644
 --- a/scribus/hyphenator.h
 +++ b/scribus/hyphenator.h
 @@ -13,7 +13,7 @@ for which a new license (GPL+exception) is in place.
diff --git a/app-office/scribus/files/scribus-1.5.8-python-3.12.patch b/app-office/scribus/files/scribus-1.5.8-python-3.12.patch
index ba30cb3eb467..0e13892c7e26 100644
--- a/app-office/scribus/files/scribus-1.5.8-python-3.12.patch
+++ b/app-office/scribus/files/scribus-1.5.8-python-3.12.patch
@@ -1,9 +1,9 @@
 Backport of https://github.com/scribusproject/scribus/commit/065459990d1fe097d4339653c7ba600cc3547523 to fix
-https://bugzilla.redhat.com/show_bug.cgi?id=2155514: Fails to build with Python 3.12: error: 'PyUnicode_AS_UNICODE'
+https://bugzilla.redhat.com/2155514: Fails to build with Python 3.12: error: 'PyUnicode_AS_UNICODE'
 was not declared in this scope.
 
---- scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp		2022-01-23 17:16:04.000000000 +0100
-+++ scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp.python-3.12	2023-06-17 23:59:35.497937156 +0200
+--- scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp
++++ scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp.python-3.12
 @@ -409,10 +409,8 @@
  			success = obj->setProperty(propertyName, QString::fromUtf8(PyBytes_AsString(objValue)));
  		else if (PyUnicode_Check(objValue))
diff --git a/app-office/scribus/files/scribus-1.6.0-fix-desktop.patch b/app-office/scribus/files/scribus-1.6.0-fix-desktop.patch
new file mode 100644
index 000000000000..ad4d88818295
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.6.0-fix-desktop.patch
@@ -0,0 +1,20 @@
+--- a/scribus.desktop.in
++++ b/scribus.desktop.in
+@@ -1,11 +1,11 @@
+ [Desktop Entry]
+ Type=Application
+-Name=Scribus
+-Name[ar]=سكريبس
+-Name[fa]=اسکریباس
+-Name[lo]=ສະຄຣີບັດສ໌
+-Name[ru]=Scribus
+-Name[ta]=ஸ்கிரிபஸ்
++Name=Scribus@TAG_VERSION@
++Name[ar]=سكريبس@TAG_VERSION@
++Name[fa]=اسکریباس@TAG_VERSION@
++Name[lo]=ສະຄຣີບັດສ໌@TAG_VERSION@
++Name[ru]=Scribus@TAG_VERSION@
++Name[ta]=ஸ்கிரிபஸ்@TAG_VERSION@
+ Comment=Page Layout and Publication
+ Comment[ar]=سكريبس
+ Comment[fa]=اسکریباس