upg gdb gtk-doc meson

This commit is contained in:
joborun linux 2023-07-18 11:12:03 +03:00
parent 1ca8dadc10
commit 852a9f4a96
11 changed files with 129 additions and 65 deletions

View File

@ -9,20 +9,20 @@ pkgbase=gdb
# gdb-common is a package that contains files common for all cross compiled versions
# of gdb (for arm/avr/...)
pkgname=(gdb gdb-common)
pkgver=13.1
pkgrel=03
pkgver=13.2
pkgrel=01
pkgdesc='The GNU Debugger'
url='https://www.gnu.org/software/gdb/'
makedepends=(glibc gcc-libs texinfo python guile ncurses expat xz mpfr
boost source-highlight readline)
source=(https://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.xz{,.sig}
rust.patch::"https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=562403d4f5483e0787219fdb88da72c707c8d7f6")
source=(https://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.xz{,.sig})
# rust.patch::"https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=562403d4f5483e0787219fdb88da72c707c8d7f6")
prepare() {
cd gdb-$pkgver
patch -p1 < ../rust.patch
}
#prepare() {
# cd gdb-$pkgver
#
# patch -p1 < ../rust.patch
#}
build() {
cd gdb-$pkgver
@ -68,7 +68,6 @@ package_gdb() {
rm -r "$pkgdir/usr/share/gdb/"
}
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
@ -77,9 +76,9 @@ license=(GPL3)
validpgpkeys=('F40ADB902B24264AA42E50BF92EDB04BFF325CF3') # Joel Brobecker
sha256sums=(115ad5c18d69a6be2ab15882d365dda2a2211c14f480b3502c6eba576e2e95a0 # gdb-13.1.tar.xz
d14d21a672624767c609582d1c8eee91661e580a2fb08f7c38b35332c6d76dad # gdb-13.1.tar.xz.sig
99d8956a5a277398823ae6851855f3f8004072090ed6f89868674170d9e33c13) #rust.patch
sha256sums=(fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a # gdb-13.2.tar.xz
d9eb870c54c9c8f2531046e102c48d9cce57b9361680e4fd22cab83232a63e3e) # gdb-13.2.tar.xz.sig
## e11e5affd4b741a13509bfc58490e1fb40ccffc7004d6f197541b92a40210e90 gdb-13.2-01-x86_64.pkg.tar.lz
## a90864b3b5d646bd45494cb9c35b5ca9cf847f9a512001e01cabe246e402b48b gdb-common-13.2-01-x86_64.pkg.tar.lz
## 696dcdcac5628d5b359c314bbc6a184b29454d0cf4ee2e0f18fec9f5785e5852 gdb-13.1-03-x86_64.pkg.tar.lz
## 3805a5cb0ebad75b17acf69848a859b8a19b8595148639a7a3e53b76e2c41a1d gdb-common-13.1-03-x86_64.pkg.tar.lz

View File

@ -7,30 +7,21 @@ pkgbase=gdb
# gdb-common is a package that contains files common for all cross compiled versions
# of gdb (for arm/avr/...)
pkgname=(gdb gdb-common)
pkgver=13.1
pkgrel=3
pkgver=13.2
pkgrel=1
pkgdesc='The GNU Debugger'
arch=(x86_64)
url='https://www.gnu.org/software/gdb/'
license=(GPL3)
makedepends=(glibc gcc-libs texinfo python guile ncurses expat xz mpfr
source-highlight boost readline)
source=(https://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.xz{,.sig}
rust.patch::"https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=562403d4f5483e0787219fdb88da72c707c8d7f6")
sha1sums=('6f0f5f905085f447672d9f52af66b42207d56e46'
'SKIP'
'8dc1c2e44ebb3442d292cf6a594f70a97fa24123')
b2sums=('ab3a77ef35d21597dd1299787eebc422c3ca9764d0866223752c3036c0f9e198bf25ab4730bf6e7025bc2db148c66e98b191e15abc2d69c3088aed146728beef'
'SKIP'
'99ffd3597fa61c51c2aae129387e266121597eadcaaec15cdcfdb9e798d7b7da57ae837454143d6c4e196d98068dc19c1588e36bde2d7f05e710465fc15fd766')
source=(https://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.xz{,.sig})
sha1sums=('bcd6b05a2565f4339e1187dae428fb58a000d690'
'SKIP')
b2sums=('bf5216ba2286448a46f9e0a405367c5a678e6d7540204722d355b618018b7b75a2ebc5b51353304c5ded02a3979223a81781d305f5afa5be82516cdc2863d49f'
'SKIP')
validpgpkeys=('F40ADB902B24264AA42E50BF92EDB04BFF325CF3') # Joel Brobecker
prepare() {
cd gdb-$pkgver
patch -p1 < ../rust.patch
}
build() {
cd gdb-$pkgver

View File

@ -12,7 +12,7 @@ Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1775560
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py
index 4b5b8a9..7963840 100644
index 4b5b8a93d5d2..7963840f8d45 100644
--- a/gtkdoc/scan.py
+++ b/gtkdoc/scan.py
@@ -978,8 +978,8 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options):

View File

@ -0,0 +1,35 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Tue, 18 Jul 2023 03:46:01 +0200
Subject: [PATCH] Fix tests
---
tests/gobject/docs/meson.build | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/tests/gobject/docs/meson.build b/tests/gobject/docs/meson.build
index a1dd66cadf09..2af2cf48caf5 100644
--- a/tests/gobject/docs/meson.build
+++ b/tests/gobject/docs/meson.build
@@ -5,6 +5,13 @@ gobject_test_source_dir = join_paths(
'src'
)
+gobject_test_examples_dir = join_paths(
+ srcdir,
+ 'tests',
+ 'gobject',
+ 'examples'
+)
+
gobject_test_docs_dir = join_paths(
srcdir,
'tests',
@@ -119,6 +126,7 @@ test(
'--path=@0@'.format(':'.join([
gobject_test_docs_dir,
srcdir,
+ gobject_test_examples_dir,
])
),
],

View File

@ -7,7 +7,7 @@
pkgname=gtk-doc
pkgver=1.33.2
pkgrel=02
pkgrel=03
pkgdesc="Documentation tool for public library API"
url="https://www.gtk.org/gtk-doc/"
depends=(docbook-xsl docbook-xml glib2-docs python-lxml python-pygments)
@ -16,7 +16,8 @@ checkdepends=(bc gtk3 python-six python-parameterized)
optdepends=('dblatex: PDF support')
_commit=14391142ee9d43da116f0f530746ae34cc46930a # tags/1.33.2^0
source=("git+https://gitlab.gnome.org/GNOME/gtk-doc.git#commit=$_commit"
0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch)
0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch
0002-Fix-tests.patch)
pkgver() {
cd $pkgname
@ -28,6 +29,10 @@ prepare() {
# https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/58
git apply -3 ../0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch
# test-gobject-mkhtml: ../xml/object.xml:139: element include: XInclude error : could not load ../../exampl>
git apply -3 ../0002-Fix-tests.patch
}
build() {
@ -53,6 +58,12 @@ arch=(x86_64)
license=(GPL FDL)
sha256sums=(SKIP
95208f0e0dd6e888892b04e3396b131218d1d98e433edfbd4af70b158921319c) # 0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch
5697a9965f3d91a5635a4b46d59bf2edd3e73f0cff1ba2d9f70d401262982683 # 0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch
fbb9d43c70b6816b6527e14676339685d0f41920f2d595048ca2f3e9193ae235) # 0002-Fix-tests.patch
b2sums=('SKIP'
'82161f0f0860e9b21748b6aadf3dd7017f4541240aa3b0d54bdec74d1b6b8e771a1ab74bc0420899d09b7125361c3fcc2acb15bdf0a3fef8753a08a0992a5eb0'
'aec43a320f2c687a8c3529eb0b396dcf318b08fec8dcae06d3c2ab0ddeed04e1d324bac158cc15a50ddae768b42a815742a86c24917b295f3c3f6f2d7ad225c7')
## ddcb7f5728eca798643234230a04cd778340522b5a6ecca8484895c9ed4c55a4 gtk-doc-1.33.2-03-x86_64.pkg.tar.lz
## 1a6332d6a1a1943c228010aa21a182978e69395fd922020d92433571e82278c6 gtk-doc-1.33.2-02-x86_64.pkg.tar.lz

View File

@ -3,35 +3,61 @@
pkgname=gtk-doc
pkgver=1.33.2
pkgrel=2
pkgrel=3
pkgdesc="Documentation tool for public library API"
url="https://www.gtk.org/gtk-doc/"
arch=(any)
license=(GPL FDL)
depends=(docbook-xsl docbook-xml glib2-docs python-lxml python-pygments)
makedepends=(dblatex git yelp-tools meson)
checkdepends=(bc gtk3 python-six python-parameterized)
license=(
FDL
GPL
)
depends=(
docbook-xml
docbook-xsl
glib2-docs
python-lxml
python-pygments
)
makedepends=(
dblatex
git
meson
yelp-tools
)
checkdepends=(
bc
gtk3
python-parameterized
python-six
)
optdepends=('dblatex: PDF support')
_commit=14391142ee9d43da116f0f530746ae34cc46930a # tags/1.33.2^0
source=("git+https://gitlab.gnome.org/GNOME/gtk-doc.git#commit=$_commit"
0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch)
sha256sums=('SKIP'
'95208f0e0dd6e888892b04e3396b131218d1d98e433edfbd4af70b158921319c')
source=(
"git+https://gitlab.gnome.org/GNOME/gtk-doc.git#commit=$_commit"
0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch
0002-Fix-tests.patch
)
b2sums=('SKIP'
'82161f0f0860e9b21748b6aadf3dd7017f4541240aa3b0d54bdec74d1b6b8e771a1ab74bc0420899d09b7125361c3fcc2acb15bdf0a3fef8753a08a0992a5eb0'
'aec43a320f2c687a8c3529eb0b396dcf318b08fec8dcae06d3c2ab0ddeed04e1d324bac158cc15a50ddae768b42a815742a86c24917b295f3c3f6f2d7ad225c7')
pkgver() {
cd $pkgname
cd gtk-doc
git describe --tags | sed 's/GTK_DOC_//;s/_/\./g;s/-/+/g'
}
prepare() {
cd $pkgname
cd gtk-doc
# https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/58
git apply -3 ../0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch
# test-gobject-mkhtml: ../xml/object.xml:139: element include: XInclude error : could not load ../../examples/gobject.c, and no fallback was found
git apply -3 ../0002-Fix-tests.patch
}
build() {
arch-meson $pkgname build
arch-meson gtk-doc build
meson compile -C build
}
@ -40,7 +66,9 @@ check() {
}
package() {
DESTDIR="$pkgdir" meson install -C build
meson install -C build --destdir "$pkgdir"
python -m compileall -d /usr/lib "$pkgdir/usr/lib"
python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
}
# vim:set sw=2 sts=-1 et:

View File

@ -12,6 +12,6 @@ gtk3
python-six
python-parameterized
gettext
at-spi2-core

View File

@ -1,4 +1,6 @@
real 0m11.315s
user 0m11.254s
sys 0m1.145s
real 0m12.304s
user 0m15.909s
sys 0m1.832s

View File

@ -7,7 +7,7 @@
pkgname=meson
pkgver=1.2.0
pkgrel=01
pkgrel=02
pkgdesc='High productivity build system'
url='https://mesonbuild.com/'
depends=(ninja python python-typing_extensions)
@ -50,14 +50,12 @@ build() {
# export LC_CTYPE=en_US.UTF-8 CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS=
# ./run_tests.py --failfast
#)
#
#========================================== short test summary info ===========================================
#FAILED run_unittests.py::AllPlatformTests::test_testsetups - AssertionError: 'TEST_ENV is set' not found in "Log of Meson test suite run on 2023-07-17T22:06:46.776110...
#FAILED run_unittests.py::AllPlatformTests::test_testsetups - AssertionError: 'TEST_ENV is set' not found in "Log of Meson test suite run on 2023-07-18T10:53:40.247076...
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! stopping after 1 failures !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
#!!!!!!!!!!!!!!!!!!!!!!!!!!! xdist.dsession.Interrupted: stopping after 1 failures !!!!!!!!!!!!!!!!!!!!!!!!!!!!
#==================== 1 failed, 427 passed, 67 skipped, 455 warnings in 155.95s (0:02:35) =====================
#Total time: 156.271 seconds
#
#==================== 1 failed, 428 passed, 66 skipped, 455 warnings in 156.87s (0:02:36) =====================
#Total time: 157.172 seconds
package() {
cd $pkgname-$pkgver
@ -93,8 +91,7 @@ sha256sums=(1c0b634fe6b6a7072e398647f1bf392048577068a5c92ae44d04085dab0ded6f #
99273032f3d6ad67047659f4475edc1fa4e9bcbc43d725a84ef0ce1f084e1880 # meson-reference-1.2.0.json
aaa37ce8287cbb71a7614ace9191e438d081f03dd99d18229fa0b246a5f78a28 # 0001-Skip-broken-tests.patch
84591806f184410cec74d7d5283cb44c76157da9636db36139dcbe7212c3d4ed # 0002-Use-C-17-for-protobuf-tests.patch
ac3387ed5759cc512b1f2a4e5b3dd940274b02f943a7e5d644792ee714e6b95e # arch-meson
09d57353b4694950e37a3a069ede3961b0aa0a3184771cf4382f10b02984c1d8 # arch-meson
b2aeae2787cf8f3ffb8778ee7f1a434895b1512bc0bdb33528c4cb2aeb067904) # jobo-meson
## 4486937b57a4a536ec04aa0d0a58118838cc582384a1991890957798d259866d meson-1.2.0-01-x86_64.pkg.tar.lz
## 46f4bf5e5b3873c978134ba3f173420aa275e2e08390b9fc91223aec0cd50972 meson-1.2.0-02-x86_64.pkg.tar.lz

View File

@ -4,7 +4,7 @@
pkgname=meson
pkgver=1.2.0
pkgrel=1
pkgrel=2
pkgdesc="High productivity build system"
url="https://mesonbuild.com/"
arch=(any)
@ -77,7 +77,7 @@ b2sums=('a8239c41ab5d20c26c057293dc85e5577eb9e6eef7a39acc67a0b5b1e82b1afae341936
'SKIP'
'eb67d25e967aaeaec9453bf9af6229cbefd6fa75982e3782e703b440359d8042690d1c8a9542773dcf160af03f36a18e3b9ae3426cf566aa3679164317e774f4'
'9bb2565a8667b71c901aa690b4eb36b64011191cd7a9420c244350d0d9659657347e8a9852945fcc606f8d235af92d18adaf5804ccb60fa1fc285dba79fd1126'
'801ad7689aabd2861c760d6001ce2e84c3d5aaed867b087bc1699e7c15d914ee26c9d855999f389d28b4765f081523a1468755768bc0163185f132e157ecced1'
'211cee61f117fd1d582d7a613a8634f044e9e307791c4154c6da72bccd5f06856801b14bcb26157ee682b5935c48ffd2098a5fabab2232726d7758cf091c07f7'
'26f95bfa9ffcc602b8cacc6c6e2dfe2a3a144649e570844a66373fa8a8c2400767d58486579790099bb30f34943209edf958143c31b3e25d76200b6092f9bb3e'
'a60bbc46b1b3d1067716ff912ecd09c09c22460fac27105e591cb77905d4c8ca43e59f3f5a644737d68dd408a77071eb07e65e88731f3673363ba7b57d587071')
validpgpkeys=(

View File

@ -10,4 +10,5 @@ exec meson setup \
--wrap-mode nodownload \
-D b_lto=true \
-D b_pie=true \
-D python.bytecompile=1 \
"$@"