Date: Monday, February 14, 2022 @ 20:30:32 Author: heftig Revision: 437222
40.1-3: gedit 41 Added: gedit-plugins/trunk/fix-build.diff Modified: gedit-plugins/trunk/PKGBUILD ----------------+ PKGBUILD | 15 ++- fix-build.diff | 216 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 225 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-02-14 20:29:54 UTC (rev 437221) +++ PKGBUILD 2022-02-14 20:30:32 UTC (rev 437222) @@ -7,7 +7,7 @@ pkgname=gedit-plugins pkgver=40.1 -pkgrel=2 +pkgrel=3 pkgdesc="Collection of plugins for the gedit Text Editor" url="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"; arch=(x86_64) @@ -19,16 +19,19 @@ 'vte3: for embedded terminal' 'libgit2-glib: for git plugin') _commit=ff3e9f6b51698b91df2ccede481809860111e91b # tags/40.1^0 -source=("git+https://gitlab.gnome.org/GNOME/gedit-plugins.git#commit=$_commit";) -sha512sums=('SKIP') +source=("git+https://gitlab.gnome.org/GNOME/gedit-plugins.git#commit=$_commit"; + fix-build.diff) +sha512sums=('SKIP' + '3ee6d0918d9b27dc8f43d3433461606ad066a6a0f662d0f8d39ccbfc6f77c3abef3245e266395eb8b4e8a2518148ecf13c96bdc88aff594776c487555e9cb632') pkgver() { cd $pkgname - git describe --tags | sed 's/-/+/g' + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' } prepare() { cd $pkgname + git apply -3 ../fix-build.diff # meson 0.61 } build() { @@ -41,9 +44,9 @@ } package() { - DESTDIR="$pkgdir" meson install -C build + meson install -C build --destdir "$pkgdir" python -m compileall -d /usr "$pkgdir/usr" python -O -m compileall -d /usr "$pkgdir/usr" } -# vim:set ts=2 sw=2 et: +# vim:set sw=2 et: Added: fix-build.diff =================================================================== --- fix-build.diff (rev 0) +++ fix-build.diff 2022-02-14 20:30:32 UTC (rev 437222) @@ -0,0 +1,216 @@ +diff --git i/plugins/bookmarks/meson.build w/plugins/bookmarks/meson.build +index 4e09d60..ed051c6 100644 +--- i/plugins/bookmarks/meson.build ++++ w/plugins/bookmarks/meson.build +@@ -41,7 +41,6 @@ bookmarks_plugin = custom_target( + ) + + bookmarks_metainfo = i18n.merge_file( +- 'gedit-bookmarks.metainfo.xml', + input: 'gedit-bookmarks.metainfo.xml.in', + output: 'gedit-bookmarks.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/bracketcompletion/meson.build w/plugins/bracketcompletion/meson.build +index 4d2ff4d..5f3e653 100644 +--- i/plugins/bracketcompletion/meson.build ++++ w/plugins/bracketcompletion/meson.build +@@ -30,7 +30,6 @@ bracketcompletion_plugin = custom_target( + ) + + bracketcompletion_metainfo = i18n.merge_file( +- 'gedit-bracketcompletion.metainfo.xml', + input: 'gedit-bracketcompletion.metainfo.xml.in', + output: 'gedit-bracketcompletion.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/charmap/meson.build w/plugins/charmap/meson.build +index b7d1115..1cf02b4 100644 +--- i/plugins/charmap/meson.build ++++ w/plugins/charmap/meson.build +@@ -26,7 +26,6 @@ charmap_plugin = custom_target( + ) + + charmap_metainfo = i18n.merge_file( +- 'gedit-charmap.metainfo.xml', + input: 'gedit-charmap.metainfo.xml.in', + output: 'gedit-charmap.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/codecomment/meson.build w/plugins/codecomment/meson.build +index 49594dd..dd053b3 100644 +--- i/plugins/codecomment/meson.build ++++ w/plugins/codecomment/meson.build +@@ -30,7 +30,6 @@ codecomment_plugin = custom_target( + ) + + codecomment_metainfo = i18n.merge_file( +- 'gedit-codecomment.metainfo.xml', + input: 'gedit-codecomment.metainfo.xml.in', + output: 'gedit-codecomment.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/colorpicker/meson.build w/plugins/colorpicker/meson.build +index 889c9ce..c617d59 100644 +--- i/plugins/colorpicker/meson.build ++++ w/plugins/colorpicker/meson.build +@@ -30,7 +30,6 @@ colorpicker_plugin = custom_target( + ) + + colorpicker_metainfo = i18n.merge_file( +- 'gedit-colorpicker.metainfo.xml', + input: 'gedit-colorpicker.metainfo.xml.in', + output: 'gedit-colorpicker.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/colorschemer/meson.build w/plugins/colorschemer/meson.build +index fcb904e..0b1a483 100644 +--- i/plugins/colorschemer/meson.build ++++ w/plugins/colorschemer/meson.build +@@ -39,7 +39,6 @@ colorschemer_plugin = custom_target( + ) + + colorschemer_metainfo = i18n.merge_file( +- 'gedit-colorschemer.metainfo.xml', + input: 'gedit-colorschemer.metainfo.xml.in', + output: 'gedit-colorschemer.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/commander/meson.build w/plugins/commander/meson.build +index 2fedf80..d9bbb32 100644 +--- i/plugins/commander/meson.build ++++ w/plugins/commander/meson.build +@@ -35,7 +35,6 @@ commander_plugin = custom_target( + ) + + commander_metainfo = i18n.merge_file( +- 'gedit-commander.metainfo.xml', + input: 'gedit-commander.metainfo.xml.in', + output: 'gedit-commander.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/drawspaces/meson.build w/plugins/drawspaces/meson.build +index 75610cb..30d27aa 100644 +--- i/plugins/drawspaces/meson.build ++++ w/plugins/drawspaces/meson.build +@@ -56,7 +56,6 @@ install_data( + ) + + drawspaces_metainfo = i18n.merge_file( +- 'gedit-drawspaces.metainfo.xml', + input: 'gedit-drawspaces.metainfo.xml.in', + output: 'gedit-drawspaces.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/findinfiles/meson.build w/plugins/findinfiles/meson.build +index d900159..16c6885 100644 +--- i/plugins/findinfiles/meson.build ++++ w/plugins/findinfiles/meson.build +@@ -62,7 +62,6 @@ findinfiles_plugin = custom_target( + ) + + findinfiles_metainfo = i18n.merge_file( +- 'gedit-findinfiles.metainfo.xml', + input: 'gedit-findinfiles.metainfo.xml.in', + output: 'gedit-findinfiles.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/git/meson.build w/plugins/git/meson.build +index f6f2b0b..cfd3b65 100644 +--- i/plugins/git/meson.build ++++ w/plugins/git/meson.build +@@ -26,7 +26,6 @@ git_plugin = custom_target( + ) + + git_metainfo = i18n.merge_file( +- 'gedit-git.metainfo.xml', + input: 'gedit-git.metainfo.xml.in', + output: 'gedit-git.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/joinlines/meson.build w/plugins/joinlines/meson.build +index 12f081e..abf9673 100644 +--- i/plugins/joinlines/meson.build ++++ w/plugins/joinlines/meson.build +@@ -30,7 +30,6 @@ joinlines_plugin = custom_target( + ) + + joinlines_metainfo = i18n.merge_file( +- 'gedit-joinlines.metainfo.xml', + input: 'gedit-joinlines.metainfo.xml.in', + output: 'gedit-joinlines.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/multiedit/meson.build w/plugins/multiedit/meson.build +index 855e8ca..bd676a7 100644 +--- i/plugins/multiedit/meson.build ++++ w/plugins/multiedit/meson.build +@@ -26,7 +26,6 @@ multiedit_plugin = custom_target( + ) + + multiedit_metainfo = i18n.merge_file( +- 'gedit-multiedit.metainfo.xml', + input: 'gedit-multiedit.metainfo.xml.in', + output: 'gedit-multiedit.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/smartspaces/meson.build w/plugins/smartspaces/meson.build +index e2e682a..7a814c3 100644 +--- i/plugins/smartspaces/meson.build ++++ w/plugins/smartspaces/meson.build +@@ -34,7 +34,6 @@ smartspaces_plugin = custom_target( + ) + + smartspaces_metainfo = i18n.merge_file( +- 'gedit-smartspaces.metainfo.xml', + input: 'gedit-smartspaces.metainfo.xml.in', + output: 'gedit-smartspaces.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/synctex/meson.build w/plugins/synctex/meson.build +index c6be01d..68bad3f 100644 +--- i/plugins/synctex/meson.build ++++ w/plugins/synctex/meson.build +@@ -26,7 +26,6 @@ synctex_plugin = custom_target( + ) + + synctex_metainfo = i18n.merge_file( +- 'gedit-synctex.metainfo.xml', + input: 'gedit-synctex.metainfo.xml.in', + output: 'gedit-synctex.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/terminal/meson.build w/plugins/terminal/meson.build +index 4f56418..9dcdc6f 100644 +--- i/plugins/terminal/meson.build ++++ w/plugins/terminal/meson.build +@@ -38,7 +38,6 @@ install_data( + ) + + terminal_metainfo = i18n.merge_file( +- 'gedit-terminal.metainfo.xml', + input: 'gedit-terminal.metainfo.xml.in', + output: 'gedit-terminal.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/textsize/meson.build w/plugins/textsize/meson.build +index c7baa86..e1a4a78 100644 +--- i/plugins/textsize/meson.build ++++ w/plugins/textsize/meson.build +@@ -26,7 +26,6 @@ textsize_plugin = custom_target( + ) + + textsize_metainfo = i18n.merge_file( +- 'gedit-textsize.metainfo.xml', + input: 'gedit-textsize.metainfo.xml.in', + output: 'gedit-textsize.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/translate/meson.build w/plugins/translate/meson.build +index e87001e..ddb7ba3 100644 +--- i/plugins/translate/meson.build ++++ w/plugins/translate/meson.build +@@ -47,7 +47,6 @@ install_data( + ) + + translate_metainfo = i18n.merge_file( +- 'gedit-translate.metainfo.xml', + input: 'gedit-translate.metainfo.xml.in', + output: 'gedit-translate.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +diff --git i/plugins/wordcompletion/meson.build w/plugins/wordcompletion/meson.build +index 8a5f34b..e3a1b6d 100644 +--- i/plugins/wordcompletion/meson.build ++++ w/plugins/wordcompletion/meson.build +@@ -55,7 +55,6 @@ install_data( + ) + + wordcompletion_metainfo = i18n.merge_file( +- 'gedit-wordcompletion.metainfo.xml', + input: 'gedit-wordcompletion.metainfo.xml.in', + output: 'gedit-wordcompletion.metainfo.xml', + po_dir: join_paths(srcdir, 'po'),
