sys-apps/dbus-stub/files/changes.patch

   1 diff --git a/Makefile b/Makefile
   2 index 56f2ee9..64f08e9 100644
   3 --- a/Makefile
   4 +++ b/Makefile
   5 @@ -1,14 +1,18 @@
   6  .POSIX:
   7
   8 -PREFIX     = /usr/local
   9 -LIBDIR     = ${PREFIX}/lib
  10 -INCLUDEDIR = ${PREFIX}/include
  11 +PREFIX     ?= /usr
  12 +LIBDIR     ?= ${PREFIX}/lib64
  13 +INCLUDEDIR ?= ${PREFIX}/include
  14
  15  XCFLAGS = \
  16 -         -std=c99 -O3 -DDBUS_COMPILATION -I. \
  17 +         -std=c99 -DDBUS_COMPILATION -I. \
  18           -Wall -Wextra -pedantic -Wmissing-prototypes -Wstrict-prototypes \
  19           -Wno-unused-parameter $(CFLAGS) $(CPPFLAGS)
  20
  21 +LDFLAGS ?=
  22 +
  23 +LDFLAGS += -Wl,-soname,libdbus.so.1
  24 +
  25  OBJ = \
  26           dbus/dbus-address.o \
  27           dbus/dbus-bus.o \
  28 @@ -50,5 +54,6 @@ install: dbus-1.pc
  29         cp -f libdbus-1.* $(DESTDIR)$(LIBDIR)
  30         cp -f dbus-1.pc   $(DESTDIR)$(LIBDIR)/pkgconfig
  31         ln -sf libdbus-1.so $(DESTDIR)$(LIBDIR)/libdbus-1.so.3
  32 +       ln -sf libdbus-1.so $(DESTDIR)$(LIBDIR)/libdbus.so.1
  33
  34  .PHONY: all clean install
  35 diff --git a/dbus-1.pc.in b/dbus-1.pc.in
  36 index 7093deb..8b282e2 100644
  37 --- a/dbus-1.pc.in
  38 +++ b/dbus-1.pc.in
  39 @@ -18,4 +18,4 @@ Description: Free desktop message bus
  40  Version: 1.13.18
  41  Libs: -L${libdir} -ldbus-1
  42  Libs.private:
  43 -Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include
  44 +Cflags: -I${includedir}/dbus-1.0
  45 diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
  46 index a92330d..4284571 100644
  47 --- a/dbus/dbus-message.c
  48 +++ b/dbus/dbus-message.c
  49 @@ -261,7 +261,9 @@ dbus_uint32_t dbus_message_get_reply_serial(
  50  void dbus_message_set_auto_start(
  51      DBusMessage *message,
  52      dbus_bool_t auto_start
  53 -);
  54 +) {
  55 +
  56 +}
  57
  58  dbus_bool_t dbus_message_get_auto_start(
  59      DBusMessage *message
  60 diff --git a/dbus/dbus-types.h b/dbus/dbus-types.h
  61 index d5ad467..e7b8cd2 100644
  62 --- a/dbus/dbus-types.h
  63 +++ b/dbus/dbus-types.h
  64 @@ -16,4 +16,28 @@ typedef unsigned short dbus_uint16_t;
  65  typedef long long dbus_int64_t;
  66  typedef unsigned long long dbus_uint64_t;
  67
  68 +typedef struct
  69 +{
  70 +  dbus_uint32_t first32;
  71 +  dbus_uint32_t second32;
  72 +} DBus8ByteStruct;
  73 +
  74 +typedef union
  75 +{
  76 +  unsigned char bytes[8];
  77 +  dbus_int16_t  i16;
  78 +  dbus_uint16_t u16;
  79 +  dbus_int32_t  i32;
  80 +  dbus_uint32_t u32;
  81 +  dbus_bool_t   bool_val;
  82 +  dbus_int64_t  i64;
  83 +  dbus_uint64_t u64;
  84 +  DBus8ByteStruct eight;
  85 +  double dbl;
  86 +  unsigned char byt;
  87 +  char *str;
  88 +  int fd;
  89 +} DBusBasicValue;
  90 +
  91 +
  92  #endif