Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

geany: Update to 2.1

Browse Source 
0002-Use-FHS.patch: refresh, adjust datadir to match meson install path
0003-export.patch: refresh
0004-meson-Prevent-showing-console-after-running-geany-in.patch: applied upstream
0005-meson-Add-icon-with-geany-program.patch: applied upstream
PKGBUILD: cleanup
This commit is contained in:
Christoph Reiter
2025-07-08 08:34:33 +02:00
parent a4e8056aaf
commit 5df5ef56f3
5 changed files with 21 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
mingw-w64-geany/0002-Use-FHS.patch
View File

@@ -1,7 +1,6 @@
diff -bur geany-2.0.0-orig/meson.build geany-2.0.0/meson.build
--- geany-2.0.0-orig/meson.build 2024-03-12 21:43:57.425015200 -0600
+++ geany-2.0.0/meson.build 2024-03-12 21:45:47.160626900 -0600
@@ -134,7 +134,7 @@
--- geany-2.1.0/meson.build.orig 2025-07-06 15:22:44.000000000 +0200
+++ geany-2.1.0/meson.build 2025-07-08 08:17:31.404207600 +0200
@@ -130,7 +130,7 @@
endif
cdata.set('HAVE_PLUGINS', get_option('plugins'))
cdata.set('HAVE_SOCKET', get_option('socket'))
@@ -10,7 +9,7 @@ diff -bur geany-2.0.0-orig/meson.build geany-2.0.0/meson.build
cdata.set('GEANY_DATA_DIR', join_paths(prefix, 'data'))
cdata.set('GEANY_DOC_DIR', join_paths(prefix))
else
@@ -150,10 +150,10 @@
@@ -146,10 +146,10 @@
pcconf.set('prefix', get_option('prefix'))
pcconf.set('libdir', join_paths('${exec_prefix}', get_option('libdir')))
pcconf.set('includedir', join_paths('${prefix}', get_option('includedir')))
@@ -23,34 +22,7 @@ diff -bur geany-2.0.0-orig/meson.build geany-2.0.0/meson.build
pcconf.set('localedir', join_paths('${datarootdir}', 'locale'))
# needed programs
@@ -199,7 +199,7 @@
)
# CFLAGS for basic stuff that only depends on libc
-basic_cflags = [ '-DHAVE_CONFIG_H=1', '-O2' ]
+basic_cflags = [ '-DHAVE_CONFIG_H=1', '-O2', '-DWIN32' ]
if (gnu_source)
basic_cflags += '-D_GNU_SOURCE'
endif
@@ -443,7 +443,7 @@
include_directories: include_directories('scintilla/include')
)
-if cdata.get('HAVE_FNMATCH') == 1
+if cdata.get('HAVE_FNMATCH') == true
dep_fnmatch = dependency('', required: false)
else
# use fnmatch bundled with ctags
@@ -456,7 +456,7 @@
dep_fnmatch = declare_dependency(link_with: [fnmatch], include_directories: [ifnmatch])
endif
-if cdata.get('HAVE_REGCOMP') == 1
+if cdata.get('HAVE_REGCOMP') == true
dep_regex = dependency('', required: false)
else
# use regcomp bundled with ctags
@@ -919,15 +919,3 @@
@@ -980,15 +980,3 @@
'TODO'
]
install_data(misc, install_dir: cdata.get('GEANY_DOC_DIR'))
@@ -66,10 +38,9 @@ diff -bur geany-2.0.0-orig/meson.build geany-2.0.0/meson.build
-]
-install_data(misc, install_dir: prefix, rename: misc_rename)
-endif
diff -bur geany-2.0.0-orig/src/utils.c geany-2.0.0/src/utils.c
--- geany-2.0.0-orig/src/utils.c 2024-03-12 21:43:57.304013100 -0600
+++ geany-2.0.0/src/utils.c 2024-03-12 21:46:15.686684500 -0600
@@ -2337,7 +2337,7 @@
--- geany-2.1.0/src/utils.c.orig 2025-07-06 15:22:44.000000000 +0200
+++ geany-2.1.0/src/utils.c 2025-07-08 08:28:17.873415600 +0200
@@ -2329,7 +2329,7 @@
#ifdef G_OS_WIN32
gchar *prefix = win32_get_installation_dir();

12
mingw-w64-geany/0003-export.patch
View File

@@ -943,9 +943,8 @@ diff -bur geany-2.0-orig/src/ui_utils.h geany-2.0/src/ui_utils.h
#endif /* GEANY_DISABLE_DEPRECATED */
diff -bur geany-2.0-orig/src/utils.h geany-2.0/src/utils.h
--- geany-2.0-orig/src/utils.h 2024-03-10 16:10:47.728580400 -0600
+++ geany-2.0/src/utils.h 2024-03-10 16:26:47.324866200 -0600
--- geany-2.1.0/src/utils.h.orig 2025-07-06 15:22:44.000000000 +0200
+++ geany-2.1.0/src/utils.h 2025-07-08 08:22:04.134894900 +0200
@@ -30,6 +30,7 @@
#include <time.h>
@@ -953,8 +952,8 @@ diff -bur geany-2.0-orig/src/utils.h geany-2.0/src/utils.h
+#include <gmodule.h>
#include <gdk/gdk.h> /* for GdkColor */
G_BEGIN_DECLS
@@ -159,62 +160,89 @@
#include "document.h"
@@ -161,60 +162,86 @@
for (i = 0; i < size; i++)
@@ -1007,9 +1006,6 @@ diff -bur geany-2.0-orig/src/utils.h geany-2.0/src/utils.h
GSpawnChildSetupFunc child_setup, gpointer user_data, GPid *child_pid,
GError **error);
+G_MODULE_EXPORT
gchar *utils_utf8_strdown(const gchar *str);
+G_MODULE_EXPORT
gint utils_str_casecmp(const gchar *s1, const gchar *s2);

13
mingw-w64-geany/0004-meson-Prevent-showing-console-after-running-geany-in.patch
View File

@@ -1,13 +0,0 @@
--- a/meson.build
+++ b/meson.build
@@ -887,7 +887,8 @@
dependencies: deps,
build_rpath: meson.build_root(),
install_rpath: '$ORIGIN/../' + get_option('libdir'),
- install: true
+ install: true,
+ win_subsystem: 'windows',
)
i18n = import('i18n')

21
mingw-w64-geany/0005-meson-Add-icon-with-geany-program.patch
View File

@@ -1,21 +0,0 @@
--- a/meson.build
+++ b/meson.build
@@ -727,7 +727,10 @@
win_src = []
win_deps = []
+win_resc = []
if (host_machine.system() == 'windows')
+ windows = import('windows')
+ win_resc = windows.compile_resources('geany_private.rc')
win_src += [ 'src/win32.c', 'src/win32.h' ]
foreach lib : ['ole32', 'wsock32', 'comdlg32']
win_deps += cc.find_library(lib)
@@ -881,6 +884,7 @@
)
executable('geany',
+ win_resc,
'src/main.c',
link_with: libgeany,
c_args: geany_cflags + [ '-DG_LOG_DOMAIN="Geany"' ],

33
mingw-w64-geany/PKGBUILD
View File

@@ -8,9 +8,9 @@
_realname=geany
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
_realpkgver=2.0.0
_realpkgver=2.1.0
pkgver=${_realpkgver%.*}
pkgrel=3
pkgrel=1
pkgdesc='Fast and lightweight IDE (mingw-w64)'
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -33,16 +33,12 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-geany-plugins: various extra features")
source=("https://github.com/geany/geany/archive/${_realpkgver}/${_realname}-${_realpkgver}.tar.gz"
#https://download.geany.org/${_realname}-${pkgver}.tar.bz2{,.sig}
"0002-Use-FHS.patch"
"0003-export.patch"
"0004-meson-Prevent-showing-console-after-running-geany-in.patch"
"0005-meson-Add-icon-with-geany-program.patch")
"0003-export.patch")
validpgpkeys=('ACA0246889FB96B63382111724CCD8550E5D1CAE'
'457990C86F91F33DE05EBF1BCC03633F700990F2')
sha256sums=('a744ab9ae3e58b371de4b50990c44227c499f82e2a8ee6753307ef107748e4df'
'fd31ca884c41b9f5793fdf83669f664e05d3a97f156d4e9e5f1ccf8dff1b5195'
'842d06235cbcdf59eb42c164e37cabd86da2399d15c4eb472d11d46b13d3ba2c'
'77f818fe0a89dbc15f5d351185a865d971e38e06d11327e5261a217a02029772'
'a735533a74e91df974372dc597c0d4c809dbfc791a5bb20fdd4d01262eed3c77')
sha256sums=('95a9bfa1c176684fb6ccd528ba9c948f0c2d777d2370bb0e9c3502ea575ceb3d'
'2022839da5d1bae68e9201be2e1980fc5c2fb0d021c2a09105f5c617aa190cdd'
'208d738f58858bbaba05e2c931cfe26034d2a848a21eb301ae11121cbbe2bde1')
apply_patch_with_msg() {
for _patch in "$@"
@@ -61,14 +57,6 @@ prepare() {
# https://github.com/geany/geany/pull/3067
apply_patch_with_msg \
0003-export.patch
# https://github.com/geany/geany/pull/3811
apply_patch_with_msg \
0004-meson-Prevent-showing-console-after-running-geany-in.patch
# https://github.com/geany/geany/pull/3812
apply_patch_with_msg \
0005-meson-Add-icon-with-geany-program.patch
}
build() {
@@ -76,7 +64,7 @@ build() {
cd "build-${MSYSTEM}"
MSYS2_ARG_CONV_EXCL="--prefix=" \
${MINGW_PREFIX}/bin/meson setup \
meson setup \
--prefix="${MINGW_PREFIX}" \
--wrap-mode=nodownload \
--auto-features=enabled \
@@ -90,16 +78,13 @@ build() {
-Dplugins=true \
../${_realname}-${_realpkgver}
${MINGW_PREFIX}/bin/meson compile
meson compile
}
package() {
cd "${srcdir}/build-${MSYSTEM}"
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson install
rm -r "${pkgdir}${MINGW_PREFIX}/share/applications"
rm -r "${pkgdir}${MINGW_PREFIX}/share/man"
DESTDIR="${pkgdir}" meson install
install -Dm644 "${srcdir}"/${_realname}-${_realpkgver}/src/geany-run-helper.bat \
"${pkgdir}"${MINGW_PREFIX}/libexec/${_realname}/geany-run-helper.bat