[gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/files/

[gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/files/

[Michael Palimaka]

commit:     a07f83d09a5ac44c2cbd6d1757d422409aaf47b5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 17:49:26 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 17:49:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a07f83d0

dev-libs/grantlee: rebase slot patch

Package-Manager: portage-2.2.27

 dev-libs/grantlee/files/grantlee-slot.patch | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/dev-libs/grantlee/files/grantlee-slot.patch b/dev-libs/grantlee/files/grantlee-slot.patch
index 814fb9d..ab3557e 100644
--- a/dev-libs/grantlee/files/grantlee-slot.patch
+++ b/dev-libs/grantlee/files/grantlee-slot.patch
@@ -1,12 +1,10 @@
-Install headers to a custom location to permit slotting with Qt4 version.
-
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 45f8673..7832a3b 100644
+index dca14ec..d25656d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -94,7 +94,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6
+@@ -100,7 +100,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6
  set( LIB_INSTALL_DIR lib${LIB_SUFFIX} )
- set( PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/grantlee/${Grantlee_MAJOR_MINOR_VERSION_STRING} )
+ set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )
  set( BIN_INSTALL_DIR bin )
 -set( INCLUDE_INSTALL_DIR include )
 +set( INCLUDE_INSTALL_DIR include/grantlee5 )
@@ -14,19 +12,19 @@ index 45f8673..7832a3b 100644
  
  # set up RPATH/install_name_dir
 diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
-index 789205c..7045449 100644
+index 741fe65..20179fc 100644
 --- a/templates/lib/CMakeLists.txt
 +++ b/templates/lib/CMakeLists.txt
-@@ -79,6 +79,7 @@ add_library(Grantlee5::Templates ALIAS Grantlee_Templates)
- generate_export_header(Grantlee_Templates)
- set_property(TARGET Grantlee_Templates PROPERTY EXPORT_NAME Templates)
- target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
-+target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
+@@ -81,6 +81,7 @@ if (Qt5Script_FOUND)
  
- if (BUILD_TESTS)
-   set(GRANTLEE_TESTS_EXPORT "GRANTLEE_TEMPLATES_EXPORT")
+   target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS})
+   target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
++  target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
+   target_link_libraries(Grantlee_Templates
+     LINK_PRIVATE Qt5::Script
+   )
 diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt
-index 14163db..7c609f9 100644
+index 4c94203..e203539 100644
 --- a/textdocument/lib/CMakeLists.txt
 +++ b/textdocument/lib/CMakeLists.txt
 @@ -24,7 +24,7 @@ add_library(Grantlee_TextDocument SHARED

[gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/files/

[Michael Palimaka]

commit:     5f42cc72b15aa8a116cda0d23aa926b62fea750c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 17:56:02 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 17:56:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f42cc72

dev-libs/grantlee: cleanup patches

Package-Manager: portage-2.2.27

 dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch | 9 ++++++---
 dev-libs/grantlee/files/grantlee-slot.patch                    | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch b/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch
index a25f52b..b35dc46 100644
--- a/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch
+++ b/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch
@@ -1,6 +1,9 @@
-diff -ruN grantlee-0.3.0.orig/CMakeLists.txt grantlee-0.3.0/CMakeLists.txt
---- grantlee-0.3.0.orig/CMakeLists.txt	2012-11-01 21:14:18.000000000 +0100
-+++ grantlee-0.3.0/CMakeLists.txt	2013-03-09 12:25:56.498096399 +0100
+Do not make linker warnings fatal.
+
+Gentoo-bug: 430968
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -62,8 +62,8 @@
    endif()
  

diff --git a/dev-libs/grantlee/files/grantlee-slot.patch b/dev-libs/grantlee/files/grantlee-slot.patch
index ab3557e..5c384b7 100644
--- a/dev-libs/grantlee/files/grantlee-slot.patch
+++ b/dev-libs/grantlee/files/grantlee-slot.patch
@@ -1,3 +1,5 @@
+Install headers to a custom location to permit slotting with Qt4 version.
+
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index dca14ec..d25656d 100644
 --- a/CMakeLists.txt

[gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/files/

[Andreas Sturmlechner]

commit:     7051d6521ca70f23ea04df3bc29d7bb5dc63beed
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 23:26:04 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 23:26:04 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7051d652

dev-libs/grantlee: Fix slot patch

Thanks-to: jospezial <jospezial <AT> gmx.de>
Closes: https://bugs.gentoo.org/701534
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/grantlee/files/grantlee-9999-slot.patch | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-libs/grantlee/files/grantlee-9999-slot.patch b/dev-libs/grantlee/files/grantlee-9999-slot.patch
index 546d623ef7..9490df2327 100644
--- a/dev-libs/grantlee/files/grantlee-9999-slot.patch
+++ b/dev-libs/grantlee/files/grantlee-9999-slot.patch
@@ -5,6 +5,9 @@ Subject: [PATCH] Install headers to a custom location to permit slotting
 
 That was previously necessary with Qt4 version, let's keep it while
 Qt6 is around the corner.
+
+Amended with target_include_directories fix by jospezial.
+
 ---
  templates/lib/CMakeLists.txt    | 5 +++--
  textdocument/lib/CMakeLists.txt | 5 +++--
@@ -18,7 +21,7 @@ index 5058481..3ef29a4 100644
  
    target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS})
    target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
-+  target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
++  target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>")
    target_link_libraries(Grantlee_Templates
      PRIVATE Qt5::Qml
    )
@@ -43,7 +46,7 @@ index 2c5a96f..c42d32a 100644
        )
    endforeach()
  endif()
-+target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
++target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>")
  
  target_link_libraries(Grantlee_TextDocument
    PUBLIC Qt5::Gui
@@ -62,4 +65,3 @@ index 2c5a96f..c42d32a 100644
  )
 -- 
 2.24.0
-

[gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/files/

[Andreas Sturmlechner]

commit:     d1ff5a7d21fe1af59ba1873bcf29ee16d02938ce
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 09:26:40 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 09:27:38 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d1ff5a7d

dev-libs/grantlee: Fix grantlee-5.3.0-slot.patch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/grantlee/files/grantlee-5.3.0-slot.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch b/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
index 896290499d..444274b099 100644
--- a/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
+++ b/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
@@ -43,7 +43,7 @@ index a472267..8134d83 100644
        )
    endforeach()
  endif()
-+target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
++target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>")
  
  if (GRANTLEE_BUILD_WITH_QT6)
    target_link_libraries(Grantlee_TextDocument