summaryrefslogtreecommitdiff
path: root/scite/stackrpms-5.4.0-1.diff
diff options
context:
space:
mode:
Diffstat (limited to 'scite/stackrpms-5.4.0-1.diff')
-rw-r--r--scite/stackrpms-5.4.0-1.diff16
1 files changed, 16 insertions, 0 deletions
diff --git a/scite/stackrpms-5.4.0-1.diff b/scite/stackrpms-5.4.0-1.diff
index 772a46d..608fbc9 100644
--- a/scite/stackrpms-5.4.0-1.diff
+++ b/scite/stackrpms-5.4.0-1.diff
@@ -43,6 +43,22 @@ diff -x '.*.swp' -Naur salsa/scite/debian/.gitlab-ci.yml stackrpms/scite/debian/
-
-variables:
- SALSA_CI_ENABLE_BUILD_PACKAGE_TWICE: 1
+diff -x '.*.swp' -Naur salsa/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch stackrpms/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch
+--- salsa/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch 2023-12-04 15:32:55.372321741 -0500
++++ stackrpms/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch 2023-12-04 16:19:48.363311657 -0500
+@@ -36,9 +36,9 @@
+ -# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
+ -CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION))
+ -CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0)
+-+# For the Lua and Gnome desktop stuff to work, prefix must point to where Lua and Gnome thinks it is.
+-+CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) $(shell $(PKG_CONFIG) --cflags lua5.3)
+-+CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) $(shell $(PKG_CONFIG) --libs lua5.3)
+++# stackrpms,3 For the Lua and Gnome desktop stuff to work, prefix must point to where Lua and Gnome thinks it is.
+++CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) $(shell $(PKG_CONFIG) --cflags lua5.4)
+++CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) $(shell $(PKG_CONFIG) --libs lua5.4)
+ gnomeprefix:=$(shell $(PKG_CONFIG) --variable=prefix $(GTK_VERSION) 2>/dev/null)
+ ifndef prefix
+ ifdef gnomeprefix
diff -x '.*.swp' -Naur salsa/scite/debian/patches/series stackrpms/scite/debian/patches/series
--- salsa/scite/debian/patches/series 2023-12-04 15:32:55.372321741 -0500
+++ stackrpms/scite/debian/patches/series 2023-12-04 15:38:46.404536881 -0500
bgstack15