[Bug 30398] New: incorporate OpenBSD patches or make them unnecessary

bugzilla-daemon at freedesktop.org bugzilla-daemon at freedesktop.org
Mon Sep 27 17:25:46 CEST 2010


https://bugs.freedesktop.org/show_bug.cgi?id=30398

           Summary: incorporate OpenBSD patches or make them unnecessary
           Product: Telepathy
           Version: git master
          Platform: Other
        OS/Version: All
            Status: NEW
          Keywords: NEEDINFO
          Severity: normal
          Priority: medium
         Component: gabble
        AssignedTo: telepathy-bugs at lists.freedesktop.org
        ReportedBy: simon.mcvittie at collabora.co.uk
         QAContact: telepathy-bugs at lists.freedesktop.org
                CC: jasper at humppa.nl


OpenBSD seems to apply some patches to telepathy-gabble. In an ideal world,
distributors wouldn't need to do that.

Tracked elsewhere
-----------------

http://www.openbsd.org/cgi-bin/cvsweb/ports/net/telepathy/telepathy-gabble/patches/patch-src_util_c?rev=1.3
seems related to Bug #22972 so it's not tracked here.

Header ordering
---------------

According to Bug #30347, on OpenBSD you have to put "system headers" before
"userland headers". Is there somewhere we can find a more detailed explanation?

This is going to be awkward on Darwin: according to info autoconf, sys/socket.h
requires stdlib.h to be included first, and stdlib.h itself requires stdio.h,
so there may be no way to keep everyone happy.

Hopefully one day we can use GIO to make the whole mess someone else's
problem...

This accounts for:
http://www.openbsd.org/cgi-bin/cvsweb/ports/net/telepathy/telepathy-gabble/patches/patch-tests_twisted_test-resolver_c?rev=1.1
http://www.openbsd.org/cgi-bin/cvsweb/ports/net/telepathy/telepathy-gabble/patches/patch-src_tube-stream_c?rev=1.3
http://www.openbsd.org/cgi-bin/cvsweb/ports/net/telepathy/telepathy-gabble/patches/patch-lib_gibber_gibber-util_c?rev=1.1

NULL
----

http://www.openbsd.org/cgi-bin/cvsweb/ports/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_examples_register_c?rev=1.2
> $OpenBSD: patch-lib_ext_wocky_examples_register_c,v 1.2 2010/09/23 13:37:12 jasper Exp $
> --- lib/ext/wocky/examples/register.c.orig	Tue Sep 21 19:59:47 2010
> +++ lib/ext/wocky/examples/register.c	Tue Sep 21 20:00:23 2010
> @@ -73,7 +73,7 @@ main (int argc,
>          "password"   , pass,
>          "xmpp-server", host, NULL);
>  
> -  g_object_set (G_OBJECT (wcon), "email", email, NULL);
> +  g_object_set (G_OBJECT (wcon), "email", email, (void *)0);
>    wocky_connector_register_async (wcon, NULL, connector_callback, NULL);
>    g_main_loop_run (mainloop);

Why does this need changing?

Warnings
--------

http://www.openbsd.org/cgi-bin/cvsweb/ports/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_Makefile_in?rev=1.1
http://www.openbsd.org/cgi-bin/cvsweb/ports/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_Makefile_in?rev=1.2

Sorry, we're not going to take patches that turn off warnings. If you insist on
turning them off during build, you can use "make ERROR_CFLAGS=".

pkg-config
----------

http://www.openbsd.org/cgi-bin/cvsweb/ports/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-uninstalled_pc_in?rev=1.2
> $OpenBSD: patch-lib_ext_wocky_wocky_wocky-uninstalled_pc_in,v 1.2 2010/09/23 13:37:12 jasper Exp $
> --- lib/ext/wocky/wocky/wocky-uninstalled.pc.in.orig	Tue Sep 21 19:58:49 2010
> +++ lib/ext/wocky/wocky/wocky-uninstalled.pc.in	Tue Sep 21 19:58:52 2010
> @@ -6,7 +6,6 @@ abs_top_builddir=@abs_top_builddir@
>  Name: Wocky (uninstalled copy)
>  Description: XMPP library
>  Version: @VERSION@
> -Requires: pkg-config >= 0.21
>  Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, gio-2.0
>  Libs: ${abs_top_builddir}/wocky/libwocky.la
>  Cflags: -I${abs_top_srcdir} -I${abs_top_builddir} -I${abs_top_builddir}/wocky

Why? As noted in configure.ac, we really do require pkg-config 0.21 or later
for correct behaviour of Requires.private; pkg-config provides this
pseudo-package internally.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug.
You are the assignee for the bug.


More information about the telepathy-bugs mailing list