[csw-devel] SF.net SVN: gar:[21004] csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile

[Laurent Blume]

Dago, I'd like you to review this one, before you or me push the packages.

It first started by an error message with gvim, and I ended up doing this...

Details:
 - the file in services/ was the one missing for gvim, so it needs to be
added to the runtime;
 - I also added the binaries, their man, and the libexec, because I
think they're also needed for regular runtime, not only dev;
 - added build dependencies I found out about at home (maybe more missing);
 - added/adjusted various runtime dependencies, removed an override: I
trusted checkpkg there, it looked right (as usual);
 - added two configure parameters: by default, it looks for GTK+3.0, so
here, it was apparently built without GTK support at all. I set it to
2.0 instead; also, it automatically enabled «introspection», I'm not
sure what it is, but it broke the build. Apparently, it used to be
disabled, so I forced it to make sure it stay that way (possibly some
newer packages now make it think it's okay).


Laurent


On 2013-05-05 11:51 PM, lblume at users.sourceforge.net wrote:
> Revision: 21004
>           http://gar.svn.sourceforge.net/gar/?rev=21004&view=rev
> Author:   lblume
> Date:     2013-05-05 21:51:54 +0000 (Sun, 05 May 2013)
> Log Message:
> -----------
> gnome-base/gconf2/trunk: Missing files in the runtime package, missing dependencies, missing configure parameters for GTK2
> 
> Modified Paths:
> --------------
>     csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile
> 
> Modified: csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile	2013-05-05 21:17:21 UTC (rev 21003)
> +++ csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile	2013-05-05 21:51:54 UTC (rev 21004)
> @@ -21,13 +21,20 @@
>  
>  # Many more missing
>  BUILD_DEP_PKGS += CSWlibdbus-glib-dev
> +BUILD_DEP_PKGS += CSWlibxslt
> +BUILD_DEP_PKGS += CSWgtk-doc
> +BUILD_DEP_PKGS += CSWintltool
>  
>  PACKAGES += CSWlibgconf2-4
>  SPKG_DESC_CSWlibgconf2-4 = GNOME configuration database system, libgconf-2.so.4
>  PKGFILES_CSWlibgconf2-4 += $(call pkgfiles_lib,libgconf-2.so.4)
>  PKGFILES_CSWlibgconf2-4 += $(call baseisadirs,$(libdir),GConf/2/.*)
>  PKGFILES_CSWlibgconf2-4 += $(sharedstatedir)/locale/.*\.mo
> +PKGFILES_CSWlibgconf2-4 += $(sharedstatedir)/dbus-1/services/.*
>  PKGFILES_CSWlibgconf2-4 += $(sysconfdir)/gconf/.*
> +PKGFILES_CSWlibgconf2-4 += $(bindir)/.*
> +PKGFILES_CSWlibgconf2-4 += $(libexecdir)/.*
> +PKGFILES_CSWlibgconf2-4 += $(mandir)/man.*
>  RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWorbit2
>  RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgthread2-0-0
>  RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgmodule2-0-0
> @@ -35,8 +42,13 @@
>  RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgobject2-0-0
>  RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibglib2-0-0
>  RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibxml2-2
> -RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWoldaprt
>  RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgio2-0-0
> +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgtk-x11-2-0-0
> +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWliblber2-4-2
> +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibldap2-4-2
> +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibdbus1-3
> +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibdbus-glib1-2
> +
>  OBSOLETED_BY_CSWlibgconf2-4 += CSWgconf2
>  
>  PACKAGES += CSWlibgconf-dev
> @@ -54,9 +66,6 @@
>  RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibdbus1-3
>  RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibgio2-0-0
>  
> -# man-page only, override for now
> -CHECKPKG_OVERRIDES_CSWlibgconf-dev += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/gsettings-data-convert.1
> -
>  BUILD64_LIBS_ONLY = 1
>  
>  STRIP_LIBTOOL = 1
> @@ -64,6 +73,8 @@
>  CONFIGURE_ARGS = $(DIRPATHS)
>  CONFIGURE_ARGS += --enable-static=no
>  CONFIGURE_ARGS += --enable-gtk-doc
> +CONFIGURE_ARGS += --with-gtk=2.0
> +CONFIGURE_ARGS += --enable-introspection=no
>  
>  # CONFIGURE_ARGS += --disable-defaults-service
>  #The "defaults service" requires polkit. and dbus.
> 
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> 
> _______________________________________________
> devel mailing list
> devel at lists.opencsw.org
> https://lists.opencsw.org/mailman/listinfo/devel
>