Revert version 5.48

This commit is contained in:
VictorR2007 2020-03-09 19:42:16 +03:00
parent 38b2ef5313
commit 27344b9b27
2 changed files with 3 additions and 39 deletions

View file

@ -1,34 +0,0 @@
diff -urN bluez-5.48/Makefile.obexd bluez-5.48-patched/Makefile.obexd
--- bluez-5.48/Makefile.obexd 2015-03-11 13:01:57.000000000 +0300
+++ bluez-5.48-patched/Makefile.obexd 2020-03-09 19:26:21.826968140 +0300
@@ -2,12 +2,12 @@
if SYSTEMD
systemduserunitdir = @SYSTEMD_USERUNITDIR@
systemduserunit_DATA = obexd/src/obex.service
+endif
dbussessionbusdir = @DBUS_SESSIONBUSDIR@
dbussessionbus_DATA = obexd/src/org.bluez.obex.service
-endif
-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
obex_plugindir = $(libdir)/obex/plugins
diff -urN bluez-5.48/obexd/src/org.bluez.obex.service bluez-5.48-patched/obexd/src/org.bluez.obex.service
--- bluez-5.48/obexd/src/org.bluez.obex.service 2012-12-24 21:46:55.000000000 +0400
+++ bluez-5.48-patched/obexd/src/org.bluez.obex.service 1970-01-01 03:00:00.000000000 +0300
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.bluez.obex
-Exec=/bin/false
-SystemdService=dbus-org.bluez.obex.service
diff -urN bluez-5.48/obexd/src/org.bluez.obex.service.in bluez-5.48-patched/obexd/src/org.bluez.obex.service.in
--- bluez-5.48/obexd/src/org.bluez.obex.service.in 1970-01-01 03:00:00.000000000 +0300
+++ bluez-5.48-patched/obexd/src/org.bluez.obex.service.in 2020-03-09 19:29:34.660966382 +0300
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.bluez.obex
+Exec=@libexecdir@/obexd
+SystemdService=dbus-org.bluez.obex.service

View file

@ -22,10 +22,9 @@ Patch0: bluez-5.36-systemd-conditional.patch
Patch1: 0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch Patch1: 0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
Patch2: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch Patch2: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
Patch3: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch Patch3: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
Patch4: 0001-bluez-allow-using-obexd-without-systemd-in-the-user-sessio.patch Patch4: fix-lp1750308-upstream-commit-1bf03369.patch
Patch5: fix-lp1750308-upstream-commit-1bf03369.patch Patch5: fix_build_with_5.2-rc2_kernel_headers.patch
Patch6: fix_build_with_5.2-rc2_kernel_headers.patch Patch6: 0004-agent-Assert-possible-infinite-loop.patch
Patch7: 0004-agent-Assert-possible-infinite-loop.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: cups-devel BuildRequires: cups-devel
@ -204,7 +203,6 @@ BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1
%build %build
autoreconf -vfi autoreconf -vfi