- merged pc patch into monodir patch

[packages/dotnet-dbus-sharp.git] / dbus-monodir.patch

diff --git a/dbus-monodir.patch b/dbus-monodir.patch
index 298a2fd2fd51b94066b553178ae5d5cd8410e8ae..5ea4e06242ce410dd0d6938e273622a6995290c4 100644 (file)
--- a/dbus-monodir.patch
+++ b/dbus-monodir.patch
@@ -1,31 +1,29 @@
---- ../BUILD/dbus-0.50/mono/Makefile.am.orig   2005-01-25 20:47:13.000000000 +0100
-+++ ../BUILD/dbus-0.50/mono/Makefile.am        2005-12-03 16:00:44.000000000 +0100
-@@ -57,14 +57,14 @@
+--- dbus-sharp-0.8.1/src/Makefile.am.orig      2022-04-25 21:00:29.442324896 +0200
++++ dbus-sharp-0.8.1/src/Makefile.am   2022-04-25 21:05:16.230771229 +0200
+@@ -53,14 +53,14 @@ $(TARGET): $(CSFILES) AssemblyInfo.cs
  
- install-data-local:
+ install-data-local: $(TARGET)
        @if test -n '$(TARGET)'; then                       \
--        echo "$(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(DESTDIR)$(libdir)";    \
--        $(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) || exit 1; \
-+        echo "$(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(DESTDIR)$(prefix)/lib";    \
-+        $(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(libdir) /root $(DESTDIR)$(prefix)/lib || exit 1; \
-       fi
+-          echo "$(GACUTIL) /i $(TARGET) /package $(PACKAGE)-$(API_VERSION) /f /gacdir $(libdir) /root $(DESTDIR)$(libdir)";    \
+-          $(GACUTIL) /i $(TARGET) /package $(PACKAGE)-$(API_VERSION) /f /gacdir $(libdir) /root $(DESTDIR)$(libdir) || exit 1; \
++          echo "$(GACUTIL) /i $(TARGET) /package $(PACKAGE)-$(API_VERSION) /f /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib";    \
++          $(GACUTIL) /i $(TARGET) /package $(PACKAGE)-$(API_VERSION) /f /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib || exit 1; \
+         fi
  
  uninstall-local:
        @if test -n '$(TARGET)'; then                       \
--        echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(DESTDIR)$(libdir)";  \
--        $(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) || exit 1;   \
-+        echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(DESTDIR)$(prefix)/lib";  \
-+        $(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(libdir) /root $(DESTDIR)$(prefix)/lib || exit 1;   \
-       fi
+-          echo "$(GACUTIL) /u $(ASSEMBLY) /package $(PACKAGE)-$(API_VERSION) /gacdir $(libdir) /root $(DESTDIR)$(libdir)";  \
+-          $(GACUTIL) /u $(ASSEMBLY) /package $(PACKAGE)-$(API_VERSION) /gacdir $(libdir) /root $(DESTDIR)$(libdir) || exit 1;   \
++          echo "$(GACUTIL) /u $(ASSEMBLY) /package $(PACKAGE)-$(API_VERSION) /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib";  \
++          $(GACUTIL) /u $(ASSEMBLY) /package $(PACKAGE)-$(API_VERSION) /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib || exit 1;   \
+         fi
  
- EXTRA_DIST=                   \
---- ../BUILD/dbus-0.50/dbus-sharp.pc.in.orig   2004-06-10 14:55:28.000000000 +0200
-+++ ../BUILD/dbus-0.50/dbus-sharp.pc.in        2005-12-03 15:59:59.000000000 +0100
-@@ -1,6 +1,6 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=${prefix}/lib
- 
- Name: DBus#
- Description: DBus# - D-BUS .NET Bindings
+ .PHONY: $(TARGET)
+--- dbus-sharp-0.8.1/dbus-sharp-2.0.pc.in.orig 2013-10-07 01:56:21.000000000 +0200
++++ dbus-sharp-0.8.1/dbus-sharp-2.0.pc.in      2022-04-26 20:31:45.566928287 +0200
+@@ -8,4 +8,4 @@ Name: Managed DBus
+ Description: Managed D-Bus IPC protocol library and CLR binding
+ Version: @VERSION@
+ URL: http://mono.github.com/dbus-sharp/
+-Libs: -r:${libdir}/mono/@PACKAGE@-@API_VERSION@/dbus-sharp.dll
++Libs: -r:${prefix}/lib/mono/@PACKAGE@-@API_VERSION@/dbus-sharp.dll