diff --git a/system/devel/xorg-proto/actions.py b/system/devel/xorg-proto/actions.py index 8dba9080..86315c8d 100644 --- a/system/devel/xorg-proto/actions.py +++ b/system/devel/xorg-proto/actions.py @@ -11,8 +11,8 @@ from pisi.actionsapi import mesontools from pisi.actionsapi import get def setup(): - #shelltools.system("sed -i 's|datadir|libdir|g' meson.build") - mesontools.configure("--datadir=/usr/lib -Dlegacy=true") + # shelltools.system("sed -i 's|get_option('datadir') + '/pkgconfig|get_option('libdir') + '/pkgconfig|g' meson.build") + mesontools.configure("-Dlegacy=true") def build(): mesontools.build() diff --git a/system/devel/xorg-proto/files/pkgconfigdir.patch b/system/devel/xorg-proto/files/pkgconfigdir.patch new file mode 100644 index 00000000..df01c6e8 --- /dev/null +++ b/system/devel/xorg-proto/files/pkgconfigdir.patch @@ -0,0 +1,21 @@ +diff -Nuar a/meson.build b/meson.build +--- a/meson.build 2023-06-05 15:17:31.000000000 +0300 ++++ b/meson.build 2023-06-05 21:52:47.021561964 +0300 +@@ -64,7 +64,7 @@ + configure_file( + input : pc + '.pc.in', + output : pc + '.pc', +- install_dir : get_option('datadir') + '/pkgconfig', ++ install_dir : get_option('libdir') + '/pkgconfig', + configuration : pc_data, + ) + endforeach +@@ -102,7 +102,7 @@ + configure_file( + input : pc + '.pc.in', + output : pc + '.pc', +- install_dir : get_option('datadir') + '/pkgconfig', ++ install_dir : get_option('libdir') + '/pkgconfig', + configuration : pc_data, + ) + endforeach diff --git a/system/devel/xorg-proto/pspec.xml b/system/devel/xorg-proto/pspec.xml index 0b2310f4..03a952ef 100644 --- a/system/devel/xorg-proto/pspec.xml +++ b/system/devel/xorg-proto/pspec.xml @@ -12,7 +12,7 @@ library X.Org Protocol Headers This package includes the protocol headers needed for X11 development. - mirrors://xorg/individual/proto/xorgproto-2022.2.tar.xz + mirrors://xorg/individual/proto/xorgproto-2023.1.tar.xz meson util-macros @@ -20,7 +20,8 @@ - doc-install.patch + pkgconfigdir.patch + @@ -31,6 +32,7 @@ + /usr/lib/doc /usr/include /usr/lib/pkgconfig /usr/share/doc @@ -39,6 +41,13 @@ + + 2023-06-05 + 2023.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-08-11 2022.2