diff --git a/debian/changelog b/debian/changelog index 1e50d81..e14c7f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,76 +1,4 @@ -xdg-desktop-portal-hyprland (1.2.2-100pika1) pikauwu; urgency=medium - - * New upstream release - - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 - -xdg-desktop-portal-hyprland (1.1.0-100pika1) pikauwu; urgency=medium - - * New upstream release - - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 - -xdg-desktop-portal-hyprland (0.5.0-99pika1) lunar; urgency=medium - - * New upstream release - - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 - -xdg-desktop-portal-hyprland (0.4.0-99pika10) lunar; urgency=medium - - * Fix conflicts - - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 - -xdg-desktop-portal-hyprland (0.4.0-99pika9) lunar; urgency=medium - - * Fix conflicts - - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 - -xdg-desktop-portal-hyprland (0.4.0-99pika8) lunar; urgency=medium - - * Fix conflicts - - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 - -xdg-desktop-portal-hyprland (0.4.0-99pika7) lunar; urgency=medium - - * Fix conflicts - - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 - -xdg-desktop-portal-hyprland (0.4.0-99pika6) lunar; urgency=medium - - * Fix install - - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 - -xdg-desktop-portal-hyprland (0.4.0-99pika5) lunar; urgency=medium - - * Fix deps - - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 - -xdg-desktop-portal-hyprland (0.4.0-99pika4) lunar; urgency=medium - - * Include share picker - - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 - -xdg-desktop-portal-hyprland (0.4.0-99pika3) lunar; urgency=medium - - * Include share picker - - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 - -xdg-desktop-portal-hyprland (0.4.0-99pika2) lunar; urgency=medium - - * Initial release. - - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 - -xdg-desktop-portal-hyprland (0.4.0-99pika1) lunar; urgency=medium +hyprwayland-scanner (0.3.10-100pika1) main; urgency=medium * Initial release. diff --git a/debian/control b/debian/control index a4be934..5d583ce 100644 --- a/debian/control +++ b/debian/control @@ -1,41 +1,26 @@ -Source: xdg-desktop-portal-hyprland +Source: hyprwayland-scanner Section: main Priority: optional Maintainer: ferrreo Standards-Version: 4.6.1 Build-Depends: debhelper-compat (= 13), - qt6-base-dev, - qt6-wayland-dev, - meson, build-essential, - ninja-build, - libpipewire-0.3-dev, cmake-extras, - libgbm-dev, - libdrm-dev, - cmake, - wayland-protocols, - uuid-dev, - libinih-dev, - libsystemd-dev, - libsdbus-c++-dev, + cmake Rules-Requires-Root: no -Package: xdg-desktop-portal-hyprland +Package: hyprwayland-scanner Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, - hyprland, - qt6-wayland, - xdg-desktop-portal, -Provides: xdg-desktop-portal-hyprland, xdg-desktop-portal-backend (= 1.7.1) -Description: Desktop portal for hyprland + libpugixml1v5 +Description: A Hyprland implementation of wayland-scanner. -Package: xdg-desktop-portal-hyprland-dev +Package: hyprwayland-scanner-dev Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, - xdg-desktop-portal-hyprland (= ${binary:Version}), -Description: Development files for Desktop portal for hyprland + hyprwayland-scanner (= ${binary:Version}), +Description: Development files for the Hyprland implementation of wayland-scanner. diff --git a/debian/hyprwayland-scanner-dev.install b/debian/hyprwayland-scanner-dev.install new file mode 100644 index 0000000..b3c9cd8 --- /dev/null +++ b/debian/hyprwayland-scanner-dev.install @@ -0,0 +1 @@ +/usr/share/pkgconfig/hyprwayland-scanner.pc diff --git a/debian/xdg-desktop-portal-hyprland.install b/debian/hyprwayland-scanner.install similarity index 100% rename from debian/xdg-desktop-portal-hyprland.install rename to debian/hyprwayland-scanner.install diff --git a/debian/rules b/debian/rules index f48589c..2083a0f 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ SHARE = /usr/share 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 + pkgdir = $(srcdir)/debian/hyprwayland-scanner ## === End end of region === @@ -59,33 +59,22 @@ srcdir = $(shell debian/scripts/get_pwd.sh) ## 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 +override_dh_auto_configure: + cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_DATADIR=/usr/share -DCMAKE_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu -B ./build + +override_dh_build: + cmake --build ./build --config Release ## overriding dh_install to install files to a package: override_dh_auto_install: 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=$(pkgdir) cmake --install build ## === 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 deleted file mode 100644 index d6d0a29..0000000 --- a/debian/xdg-desktop-portal-hyprland-dev.install +++ /dev/null @@ -1 +0,0 @@ -/usr/share/pkgconfig/hyprland-protocols.pc diff --git a/main.sh b/main.sh index a1c568d..2b286c8 100755 --- a/main.sh +++ b/main.sh @@ -2,11 +2,13 @@ DEBIAN_FRONTEND=noninteractive +set -e + apt-get update # Clone Upstream -git clone --recurse-submodules https://github.com/hyprwm/xdg-desktop-portal-hyprland.git -b v1.2.2 -cd xdg-desktop-portal-hyprland +git clone --recurse-submodules https://github.com/hyprwm/hyprcursor -b v0.3.10 +cd hyprcursor cp -rvf ../debian ./ # Get build deps