OBS User unknown 2007-01-15 23:08:39 +00:00 committed by Git OBS Bridge
commit 4019e0d6bb
9 changed files with 267 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

19
dbus-1-glib.changes Normal file
View File

@ -0,0 +1,19 @@
-------------------------------------------------------------------
Mon Nov 6 15:54:16 CET 2006 - thoenig@suse.de
- loosen dependency to D-Bus
-------------------------------------------------------------------
Tue Aug 1 23:03:57 CEST 2006 - thoenig@suse.de
- new upstream version 0.71
- new package: dbus-1-glib-devel
- moved dbus-binding-tool from dbus-1-glib to dbus-1-glib-devel
- moved GLib header and .la files from dbus-1-devel to
dbus-1-glib-devel
-------------------------------------------------------------------
Tue Aug 1 23:03:23 CEST 2006 - thoenig@suse.de
- split out binings to sparate spec files

138
dbus-1-glib.spec Normal file
View File

@ -0,0 +1,138 @@
#
# spec file for package dbus-1-glib (Version 0.71)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: dbus-1-glib
BuildRequires: dbus-1 dbus-1-devel dbus-1-x11 expat glib2-devel libxml2-devel
URL: http://dbus.freedesktop.org/
License: GNU General Public License (GPL) - all versions, Other License(s), see package
Group: Development/Libraries/Other
Version: 0.71
Release: 19
Autoreqprov: on
Summary: GLib-based library for using D-Bus
Source0: dbus-glib-%{version}.tar.gz
Patch0: dbus-glib-nameownerchange-workaround-thoenig-01.patch
Patch1: dbus-glib-introspect-fix-thoenig-01.patch
Patch2: dbus-glib-gvalue-utils-fix-thoenig-01.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: dbus-1 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`)
%package -n dbus-1-glib-devel
Summary: Developer package for D-BUS/GLib bindings
Requires: dbus-1 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`)
Requires: dbus-1-devel >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1-devel`)
Requires: dbus-1-glib = %{version}
Requires: glib2-devel
Autoreqprov: on
Group: Development/Libraries/Other
%description
D-Bus add-on library to integrate the standard D-Bus library with the
GLib thread abstraction and main loop.
Authors:
--------
Olivier Andrieu <oliv__a@users.sourceforge.net>
Philip Blundell <pb@nexus.co.uk>
Anders Carlsson <andersca@gnome.org>
Kristian Hogsberg <krh@redhat.com>
Alex Larsson <alexl@redhat.com>
Michael Meeks <michael@ximian.com>
Seth Nickell <seth@gnome.org>
Havoc Pennington <hp@redhat.com>
Harri Porten <porten@kde.org>
Matthew Rickard <mjricka@epoch.ncsc.mil>
Zack Rusin <zack@kde.org>
Joe Shaw <joe@assbarn.com>
Colin Walters <walters@gnu.org>
David Zeuthen <david@fubar.dk>
%description -n dbus-1-glib-devel
D-Bus add-on library to integrate the standard D-Bus library with the
GLib thread abstraction and main loop.
Authors:
--------
Olivier Andrieu <oliv__a@users.sourceforge.net>
Philip Blundell <pb@nexus.co.uk>
Anders Carlsson <andersca@gnome.org>
Kristian Hogsberg <krh@redhat.com>
Alex Larsson <alexl@redhat.com>
Michael Meeks <michael@ximian.com>
Seth Nickell <seth@gnome.org>
Havoc Pennington <hp@redhat.com>
Harri Porten <porten@kde.org>
Matthew Rickard <mjricka@epoch.ncsc.mil>
Zack Rusin <zack@kde.org>
Joe Shaw <joe@assbarn.com>
Colin Walters <walters@gnu.org>
David Zeuthen <david@fubar.dk>
%prep
%setup -n dbus-glib-%{version} -q
%patch0 -p0
%patch1 -p0
%patch2 -p0
autoreconf -fi
%build
export CFLAGS="${RPM_OPT_FLAGS} -fstack-protector -fno-strict-aliasing -fPIC"
./configure \
--prefix=%{_prefix} \
--exec_prefix=%{_exec_prefix} \
--sysconfdir=%{_sysconfdir} \
--datadir=%{_datadir} \
--localstatedir=%{_localstatedir} \
--libdir=%{_libdir} \
--mandir=%{_mandir}
make
%install
make DESTDIR=%{buildroot} install
%post
%{run_ldconfig}
%postun
%{run_ldconfig}
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root)
%{_libdir}/*glib*.so.*
%{_libdir}/*glib*.so
%files -n dbus-1-glib-devel
%defattr(-, root, root)
%{_bindir}/dbus-binding-tool
%{_includedir}/dbus-1.0/dbus/*
%{_libdir}/*glib*.a
%{_libdir}/*glib*.la
%{_libdir}/pkgconfig/dbus-glib-1.pc
%changelog -n dbus-1-glib
* Mon Nov 06 2006 - thoenig@suse.de
- loosen dependency to D-Bus
* Tue Aug 01 2006 - thoenig@suse.de
- new upstream version 0.71
- new package: dbus-1-glib-devel
- moved dbus-binding-tool from dbus-1-glib to dbus-1-glib-devel
- moved GLib header and .la files from dbus-1-devel to
dbus-1-glib-devel
* Tue Aug 01 2006 - thoenig@suse.de
- split out binings to sparate spec files

3
dbus-glib-0.71.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b58a489fdd35a70d241f512bc08f3b6d9d8e05110f4a1d5341cff6a0b7d854b7
size 566889

View File

@ -0,0 +1,10 @@
--- dbus/dbus-gvalue-utils.c 2005-07-18 11:19:13.000000000 +0200
+++ dbus/dbus-gvalue-utils_mod.c 2005-07-18 11:19:09.000000000 +0200
@@ -254,6 +254,7 @@
break;
default:
g_assert_not_reached ();
+ return FALSE;
}
}

View File

@ -0,0 +1,42 @@
From: John (J5) Palmieri <johnp@redhat.com>
To: Timo Hoenig <thoenig@suse.de>
Subject: Re: GLib bindings in build environment
Date: Tue, 01 Aug 2006 13:48:41 -0400 (19:48 CEST)
The system should be running a system bus in the split but there are
cases where the system bus wouldn't be the same version so it was a bit
of a mistake. The solution is to not generate on the fly.
On Tue, 2006-08-01 at 19:32 +0200, Timo Hoenig wrote:
> Hey John,
>
> Has there been a particular reason to use the system bus -- and not a
> session bus as before -- for buildings ./tools of the GLib bindings?
>
> Timo
--- tools/Makefile.am_org 2006-08-01 21:04:47.000000000 +0200
+++ tools/Makefile.am 2006-08-01 21:06:09.000000000 +0200
@@ -8,8 +8,8 @@
BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
-dbus-bus-introspect.xml:
- DBUS_TOP_BUILDDIR=$(top_builddir) dbus-send --system --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
+dbus-bus-introspect.xml:
+ DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
EXTRA_DIST = run-with-tmp-session-bus.sh
--- tools/run-with-tmp-session-bus.sh_org 2006-08-01 21:39:00.000000000 +0200
+++ tools/run-with-tmp-session-bus.sh 2006-08-01 21:39:30.000000000 +0200
@@ -27,7 +27,7 @@
echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
## create a configuration file based on the standard session.conf
-cat $DBUS_TOP_BUILDDIR/tools/session.conf | \
+cat /etc/dbus-1/session.conf | \
sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \
sed -e 's/<include.*$//g' \
> $CONFIG_FILE

View File

@ -0,0 +1,31 @@
--- dbus/dbus-gproxy.c 2005-11-30 20:32:26.000000000 +0100
+++ dbus/dbus-gproxy.c 2006-02-21 22:42:46.000000000 +0100
@@ -494,6 +494,9 @@
const DBusGProxyNameOwnerInfo *info = a;
const char *name = b;
+ g_return_val_if_fail (a != NULL, 1);
+ g_return_val_if_fail (b != NULL, 1);
+
return strcmp (info->name, name);
}
@@ -556,6 +559,8 @@
GSList *names;
gboolean insert;
+ g_return_if_fail (info != NULL);
+
names = g_hash_table_lookup (manager->owner_names, owner);
/* Only need to g_hash_table_insert the first time */
@@ -749,7 +754,8 @@
}
else
{
- insert_nameinfo (manager, new_owner, info);
+ if (info != NULL)
+ insert_nameinfo (manager, new_owner, info);
}
}
}

0
ready Normal file
View File