← recipes

Commit 138dfea

0
plików
+0
dodanych
-0
usuniętych
@@ -846,49 +846,45 @@ footprint_glib_zh: |
846 846 -rw-r--r-- root/root usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo
847 847
848 848 build: |
849 - mkdir build
849 + # 1. Nałożenie patcha na glib
850 + patch -d ${pkgname}-${pkgver} -Np1 -i ../glib-skip_warnings-1.patch
850 851
851 - cd ${pkgname}-${pkgver}
852 -
853 - patch -Np1 -i ../glib-skip_warnings-1.patch
854 -
855 - if [[ -e ${PKGDIR}/usr/include/glib-2.0 ]]
856 - then
857 - mv -vf ${PKGDIR}/usr/include/glib-2.0{,.old}
858 - fi
859 - cd build
860 -
861 - meson --prefix=/usr \
852 + # 2. Pierwsze przejście GLib (bez introspection)
853 + meson setup ${pkgname}-${pkgver} build-glib-1 \
854 + --prefix=/usr \
862 855 --libdir=/usr/lib \
856 + --buildtype=release \
863 857 -Dintrospection=disabled \
864 - -Dman=false \
865 - ../${pkgname}-${pkgver}
866 -
867 - ninja
868 - ninja install
858 + -Dman-pages=disabled
869 859
870 - cd ../
871 - rm -r build/
860 + ninja -C build-glib-1
861 + DESTDIR="/" ninja -C build-glib-1 install
872 862
873 - meson setup ./gobject-introspection-1.86.0 gi-build \
874 - --prefix=/usr \
875 - --libdir=/usr/lib \
876 - --buildtype=release
877 - ninja -C gi-build
878 - ninja -C gi-build install
863 + # 3. Kompilacja gobject-introspection
864 + meson setup gobject-introspection-1.86.0 build-gi \
865 + --prefix=/usr \
866 + --libdir=/usr/lib \
867 + --buildtype=release
879 868
880 - # Build glib again
881 - # with introspection
882 - mkdir build && cd build
869 + LD_LIBRARY_PATH="$(pwd)/build-gi/girepository:${LD_LIBRARY_PATH:-}" ninja -C build-gi
870 + DESTDIR="/" ninja -C build-gi install
883 871
884 - meson --prefix=/usr \
872 + # 4. Drugie przejście GLib (z włączonym introspection)
873 + meson setup ${pkgname}-${pkgver} build-glib-2 \
874 + --prefix=/usr \
885 875 --libdir=/usr/lib \
876 + --buildtype=release \
886 877 -Dintrospection=enabled \
887 - -Dman-pages=disabled \
888 - ../${pkgname}-${pkgver}
889 - ninja
878 + -Dman-pages=disabled
879 +
880 + ninja -C build-glib-2
890 881
891 882 package: |
892 - mkdir -p ${PKGDIR}/usr/share/backgrounds
893 - mv nutyx ${PKGDIR}/usr/share/backgrounds
894 - DESTDIR=${PKGDIR} ninja -C build install
883 + # Instalacja docelowa do $PKGDIR
884 + DESTDIR="${PKGDIR}" ninja -C build-glib-2 install
885 +
886 + # Przeniesienie tła nutyx jeśli katalog istnieje
887 + if [ -d "background-nutyx-0.0.3" ]; then
888 + mkdir -p "${PKGDIR}/usr/share/backgrounds"
889 + cp -r background-nutyx-0.0.3 "${PKGDIR}/usr/share/backgrounds/nutyx"
890 + fi