From 044a1daf8ec8846839ecda77fc6d5858d45932ed Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (Cosmic Fusion)" <83735213+CosmicFusion@users.noreply.github.com> Date: Tue, 2 Jul 2024 00:48:45 +0300 Subject: [PATCH] --- debian/changelog | 6 ++ debian/rules | 85 ++----------------- .../xdg-desktop-portal-hyprland-dev.install | 2 +- main.sh | 2 +- 4 files changed, 14 insertions(+), 81 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1e50d81..06399f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xdg-desktop-portal-hyprland (1.3.2-100pika1) pikauwu; urgency=medium + + * New upstream release + + -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 + xdg-desktop-portal-hyprland (1.2.2-100pika1) pikauwu; urgency=medium * New upstream release diff --git a/debian/rules b/debian/rules index f48589c..9aa4073 100755 --- a/debian/rules +++ b/debian/rules @@ -4,88 +4,15 @@ ## Output every command that modifies files on the build system. export DH_VERBOSE = 1 -## === Set paths env vars === -PREFIX = /usr -LIBEXEC = /usr/lib -SHARE = /usr/share - -## Source directory, called upon by $(srcdir) -srcdir = $(shell debian/scripts/get_pwd.sh) - -## If building a singular package you can remove the number, and as you guessed you call upon it with $(pkgdir) - pkgdir = $(srcdir)/debian/xdg-desktop-portal-hyprland - -## === End end of region === - -## === the chain of command === -## debuild runs a chain of dh functions in the following order: -## dh_testdir -## dh_clean -## dh_auto_clean -## dh_update_autotools_config -## dh_autoreconf -## dh_auto_configure -## dh_prep -## dh_build -## dh_auto_build -## dh_install -## dh_auto_install -## dh_installdocs -## dh_installchangelogs -## dh_perl -## dh_link -## dh_strip_nondeterminism -## dh_compress -## dh_fixperms -## dh_missing -## dh_dwz -## dh_strip -## dh_makeshlibs -## dh_shlibdeps -## dh_installdeb -## dh_gencontrol -## but you are most likely to only need to override the following: -## dh_clean -## dh_auto_configure -## dh_build -## dh_install - -## === End end of region === - -## === overriding dh functions === -## by default all dh functions will run a specific command based on the build system selected by "dh $@" -## if you have a makefile that does everything you need this is fine, -## but most likely you have no MakeFile and you want to add your own commands -## Note : overrides must be places above %: -## So here's a few examples: - -override_dh_build: - make all - -## overriding dh_clean to make it not delete rust vendor files: -#override_dh_clean: -# echo "disabled" - ## overriding dh_auto_configure to add custom configs: -#override_dh_auto_configure: -# $(srcdir)/configure -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_DATADIR=/usr/share -DCMAKE_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu -DBUILD_PLUGIN=OFF - -## overriding dh_install to install files to a package: -override_dh_auto_install: +override_dh_auto_configure: + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu -B build + cmake --build build --config Release --target all override_dh_install: - mkdir -p $(pkgdir)/${LIBEXEC} - mkdir -p $(pkgdir)/${SHARE} - mkdir -p $(pkgdir)/usr/bin - mkdir -p $(pkgdir)/${SHARE}/dbus-1/services - mkdir -p $(pkgdir)/${LIBEXEC}/systemd/user - mkdir -p $(pkgdir)/${SHARE}/xdg-desktop-portal/portals - cp -f $(srcdir)/build/hyprland-share-picker/hyprland-share-picker $(pkgdir)/usr/bin/hyprland-share-picker - cp -f $(srcdir)/build/xdg-desktop-portal-hyprland $(pkgdir)/${LIBEXEC}/xdg-desktop-portal-hyprland - cp -f $(srcdir)/hyprland.portal $(pkgdir)/${SHARE}/xdg-desktop-portal/portals/hyprland.portal - sed "s|@libexecdir@|${LIBEXEC}|g" $(srcdir)/org.freedesktop.impl.portal.desktop.hyprland.service.in > $(pkgdir)/${SHARE}/dbus-1/services/org.freedesktop.impl.portal.desktop.hyprland - sed "s|@libexecdir@|${LIBEXEC}|g" $(srcdir)/contrib/systemd/xdg-desktop-portal-hyprland.service.in > $(pkgdir)/${LIBEXEC}/systemd/user/xdg-desktop-portal-hyprland.service - chmod 755 $(pkgdir)/${LIBEXEC}/xdg-desktop-portal-hyprland + DESTDIR=debian/tmp cmake --install build + dh_install + rm -rfv debian/xdg-desktop-portal-hyprland/usr/lib/*/pkgconfig/hyprland-protocols.pc ## === End end of region === ## This here will start the build: diff --git a/debian/xdg-desktop-portal-hyprland-dev.install b/debian/xdg-desktop-portal-hyprland-dev.install index d6d0a29..25c1161 100644 --- a/debian/xdg-desktop-portal-hyprland-dev.install +++ b/debian/xdg-desktop-portal-hyprland-dev.install @@ -1 +1 @@ -/usr/share/pkgconfig/hyprland-protocols.pc +usr/lib/*/pkgconfig/hyprland-protocols.pc diff --git a/main.sh b/main.sh index a1c568d..b250f2b 100755 --- a/main.sh +++ b/main.sh @@ -5,7 +5,7 @@ DEBIAN_FRONTEND=noninteractive apt-get update # Clone Upstream -git clone --recurse-submodules https://github.com/hyprwm/xdg-desktop-portal-hyprland.git -b v1.2.2 +git clone --depth=1 --recurse-submodules https://github.com/hyprwm/xdg-desktop-portal-hyprland.git -b v1.3.2 cd xdg-desktop-portal-hyprland cp -rvf ../debian ./