diff --git a/common/shlibs b/common/shlibs index 5ca1674725da8a..72d5ade8549234 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3759,11 +3759,11 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1 libqmdnsengine.so.0 qmdnsengine-0.1.0_1 libyang.so.1 libyang-1.0r5_1 libhtp.so.2 libhtp-0.5.30_1 -libgedit-50.so gedit-50.0_1 +libgedit-51.so gedit-51.0_1 libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1 -libgedit-gtksourceview-300.so.5 libgedit-gtksourceview-299.7.0_1 +libgedit-gtksourceview-300.so.6 libgedit-gtksourceview-299.8.0_1 libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1 -libgedit-tepl-6.so.4 libgedit-tepl-6.14.0_1 +libgedit-tepl-6.so.5 libgedit-tepl-6.15.0_1 libchewing.so.3 libchewing-0.12.0_1 libdwarves.so.1 pahole-1.12_1 libdwarves_emit.so.1 pahole-1.12_1 diff --git a/srcpkgs/enter-tex/template b/srcpkgs/enter-tex/template index e2a1cab3fb2754..d13a627a979105 100644 --- a/srcpkgs/enter-tex/template +++ b/srcpkgs/enter-tex/template @@ -1,6 +1,6 @@ # Template file for 'enter-tex' pkgname=enter-tex -version=3.49.0 +version=3.51.0 revision=1 build_helper="gir" build_style=meson @@ -15,7 +15,7 @@ license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/World/gedit/enter-tex" changelog="https://gitlab.gnome.org/World/gedit/enter-tex/-/raw/main/NEWS" distfiles="https://gitlab.gnome.org/World/gedit/enter-tex/-/archive/${version}/enter-tex-${version}.tar.gz" -checksum=3d14fd0e6cd5fa761ab88b584efd2ea620090e37fe9e162332fafa08c4196928 +checksum=3dbd7c4fa1262eee92c60db1413ea2b9a0a3494c12e72c3202ad9055d07a5c9e replaces="gnome-latex>=0" build_options="gtk_doc" diff --git a/srcpkgs/gedit-plugins b/srcpkgs/gedit-plugins new file mode 120000 index 00000000000000..a1d833e423d68a --- /dev/null +++ b/srcpkgs/gedit-plugins @@ -0,0 +1 @@ +gedit \ No newline at end of file diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template deleted file mode 100644 index 1b1018fb3691a1..00000000000000 --- a/srcpkgs/gedit-plugins/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'gedit-plugins' -# keep major version in sync with gedit -pkgname=gedit-plugins -version=50.0 -revision=1 -build_style=meson -hostmakedepends="gettext glib-devel itstool pkg-config appstream-glib" -makedepends="gedit-devel libgedit-gtksourceview-devel gtk+3-devel - libglib-devel libpeas-devel" -short_desc="Set of plugins for Gedit" -maintainer="Enno Boland " -license="GPL-2.0-or-later" -homepage="https://gitlab.gnome.org/World/gedit/gedit-plugins" -changelog="https://gitlab.gnome.org/World/gedit/gedit-plugins/-/raw/master/NEWS" -distfiles="https://gitlab.gnome.org/World/gedit/gedit-plugins/-/archive/${version}/gedit-plugins-${version}.tar.gz" -checksum=fc9d9593509fbcf6867dc3a995c71ae4ad376279afabeddb3c7e1a6973eecfd5 diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index 59d12a8db645cf..b6781b44aafe4c 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -1,9 +1,7 @@ # Template file for 'gedit' -# keep major version in sync with gedit-plugins pkgname=gedit -version=50.0 +version=51.0 revision=1 -_libgd_gitrev=3cccf99234288a6121b3945a25cd4ec3b7445c74 build_helper="gir" build_style=meson configure_args="-Dgtk_doc=false" @@ -17,22 +15,10 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://gedit-text-editor.org" changelog="https://gitlab.gnome.org/World/gedit/gedit/-/raw/${version}/NEWS" -distfiles="https://gitlab.gnome.org/World/gedit/gedit/-/archive/${version}/gedit-${version}.tar.gz - https://gitlab.gnome.org/GNOME/libgd/-/archive/${_libgd_gitrev}/libgd-${_libgd_gitrev}.tar.gz" -checksum="a00d0e85f9c6fd4ad9ba28ef07a3f4df1d37170ab8d925812446fea257d518ed - bb1387edfd79a764241b60e1288fe1da7277137328d4b412333e2ca2cb817586" -skip_extraction="libgd-${_libgd_gitrev}.tar.gz" -shlib_provides="libgedit-50.so" - -# gedit tarballs are no longer being produced for download.gnome.org. -# See: https://gitlab.gnome.org/World/gedit/gedit/-/issues/611 -# The tarballs from gitlab don't automatically include git submodules. -# libgd is not versioned and is intended to be included in projects directly. -# This works around the issue by downloading the revision corresponding to -# the latest git head at the time of relesase. -post_extract() { - vsrcextract -C subprojects/libgd "libgd-${_libgd_gitrev}.tar.gz" -} +distfiles="https://gitlab.gnome.org/World/gedit/gedit/-/archive/${version}/gedit-${version}.tar.gz" +checksum=9275d1aa135a13e1d9168114d038a983ec445fb4ca73ff016b11f2a9ea7648a8 +shlib_provides="libgedit-51.so" +replaces="gedit-plugins>=0" gedit-devel_package() { depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel @@ -44,3 +30,9 @@ gedit-devel_package() { vmove usr/share/gedit/gir-1.0 } } + +gedit-plugins_package() { + metapackage=yes + short_desc+=" (transitional dummy package)" + depends="${sourcepkg}>=${version}_${revision}" +} diff --git a/srcpkgs/libgedit-amtk/template b/srcpkgs/libgedit-amtk/template index d0a54b27d6fa5a..17138a1ddd294b 100644 --- a/srcpkgs/libgedit-amtk/template +++ b/srcpkgs/libgedit-amtk/template @@ -1,6 +1,6 @@ # Template file for 'libgedit-amtk' pkgname=libgedit-amtk -version=5.10.0 +version=5.11.0 revision=1 build_helper="gir" build_style=meson @@ -13,7 +13,7 @@ license="LGPL-3.0-or-later" homepage="https://gitlab.gnome.org/World/gedit/libgedit-amtk" changelog="https://gitlab.gnome.org/World/gedit/libgedit-amtk/-/raw/main/NEWS" distfiles="https://gitlab.gnome.org/World/gedit/libgedit-amtk/-/archive/${version}/libgedit-amtk-${version}.tar.gz" -checksum=6c884bf4c9716110930c17f0103d01e1fa2fa5c5b705803b0d4ddf72ba6094f4 +checksum=173c79288f8fff59f35863f117a1910aa0e9620e50378ca8d26da54d0a222a76 libgedit-amtk-devel_package() { depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel" diff --git a/srcpkgs/libgedit-gfls/template b/srcpkgs/libgedit-gfls/template index 04568f508a7455..081db77c072793 100644 --- a/srcpkgs/libgedit-gfls/template +++ b/srcpkgs/libgedit-gfls/template @@ -1,6 +1,6 @@ # Template file for 'libgedit-gfls' pkgname=libgedit-gfls -version=0.4.0 +version=0.5.0 revision=1 build_style=meson build_helper=gir @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/World/gedit/libgedit-gfls" changelog="https://gitlab.gnome.org/World/gedit/libgedit-gfls/-/raw/main/NEWS" distfiles="https://gitlab.gnome.org/World/gedit/libgedit-gfls/-/archive/${version}/libgedit-gfls-${version}.tar.gz" -checksum=091952cb178430427b18ea62a4e4de5bde6335c00b7ab7eda58f31602ca33883 +checksum=b838fb9462ec796daa32888e9f04dc7900e7fe0993035a838abf369ba5fdf0fa build_options="gir gtk_doc" build_options_default="gir" diff --git a/srcpkgs/libgedit-gtksourceview/template b/srcpkgs/libgedit-gtksourceview/template index dd84044f6ad9cf..1cbdd2ca8e7dcd 100644 --- a/srcpkgs/libgedit-gtksourceview/template +++ b/srcpkgs/libgedit-gtksourceview/template @@ -1,6 +1,6 @@ # Template file for 'libgedit-gtksourceview' pkgname=libgedit-gtksourceview -version=299.7.0 +version=299.8.0 revision=1 build_helper="gir" build_style=meson @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/World/gedit/libgedit-gtksourceview" changelog="https://gitlab.gnome.org/World/gedit/libgedit-gtksourceview/-/raw/main/NEWS" distfiles="https://gitlab.gnome.org/World/gedit/libgedit-gtksourceview/-/archive/${version}/libgedit-gtksourceview-${version}.tar.gz" -checksum=c08a70666d5aad156a3fe9dd178ddd3bdf07b3733a1d37dccae0e366585e91f0 +checksum=f6a3384e12c6355ad66d38aed3c89ed8303487382f397d4408038ca9be38ccaf make_check_pre="xvfb-run" libgedit-gtksourceview-devel_package() { diff --git a/srcpkgs/libgedit-tepl/template b/srcpkgs/libgedit-tepl/template index f942ddf826d261..082924986187af 100644 --- a/srcpkgs/libgedit-tepl/template +++ b/srcpkgs/libgedit-tepl/template @@ -1,6 +1,6 @@ # Template file for 'libgedit-tepl' pkgname=libgedit-tepl -version=6.14.0 +version=6.15.0 revision=1 build_style=meson build_helper=gir @@ -16,7 +16,7 @@ license="LGPL-3.0-or-later" homepage="https://gitlab.gnome.org/World/gedit/libgedit-tepl" changelog="https://gitlab.gnome.org/World/gedit/libgedit-tepl/-/raw/main/NEWS" distfiles="https://gitlab.gnome.org/World/gedit/libgedit-tepl/-/archive/${version}/libgedit-tepl-${version}.tar.gz" -checksum=9ddd8653a673a80a4184efa822578e3f8abdd00a85ec40e3851dee56ff47450c +checksum=20a861c0973d81478eb305b1655d5b0bfd1f8f6fef409ba3cd079443e260abcf make_check_pre="xvfb-run" build_options="gir gtk_doc"