SF.net SVN: gar:[22437] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Nov 7 11:35:21 CET 2013
Revision: 22437
http://gar.svn.sourceforge.net/gar/?rev=22437&view=rev
Author: dmichelsen
Date: 2013-11-07 10:35:20 +0000 (Thu, 07 Nov 2013)
Log Message:
-----------
gtkmm: Initial commit
Modified Paths:
--------------
csw/mgar/pkg/gtkmm/trunk/Makefile
csw/mgar/pkg/gtkmm/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/gtkmm/
Removed Paths:
-------------
csw/mgar/pkg/gtkmm/trunk/files/0001-Fix-disable-tests-1.patch
csw/mgar/pkg/gtkmm/trunk/files/0003-Disable-Tests-2.patch
csw/mgar/pkg/gtkmm/trunk/files/0003-Use-etc-hosts-instead-of-etc-fstab-in-test.patch
csw/mgar/pkg/gtkmm/trunk/files/changelog.CSW
Modified: csw/mgar/pkg/gtkmm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glibmm/trunk/Makefile 2013-11-05 21:55:04 UTC (rev 22414)
+++ csw/mgar/pkg/gtkmm/trunk/Makefile 2013-11-07 10:35:20 UTC (rev 22437)
@@ -1,87 +1,80 @@
-NAME = glibmm
-VERSION = 2.28.2
+NAME = gtkmm
+VERSION = 2.24.4
GARTYPE = v2
-DESCRIPTION = C++ interface to glib2
+DESCRIPTION = C++ interface to gtk2
define BLURB
endef
-PATCHFILES += 0001-Fix-disable-tests-1.patch
-PATCHFILES += 0003-Disable-Tests-2.patch
-PATCHFILES += 0003-Use-etc-hosts-instead-of-etc-fstab-in-test.patch
-
MASTER_SITES += $(GNOME_MIRROR)
DISTFILES += $(DISTNAME).tar.xz
-DISTFILES += changelog.CSW
-GARCOMPILER = GNU
+PACKAGES += CSWlibgdkmm2-4-1
+SPKG_DESC_CSWlibgdkmm2-4-1 = C++ interface to gtk2, libgdkmm-2.4.so.1
+PKGFILES_CSWlibgdkmm2-4-1 += $(call pkgfiles_lib,libgdkmm-2.4.so.1)
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibpangoft2-1-0-0
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibgiomm2-4-1
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibsigc2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibglibmm2-4-1
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibcairomm1-0-1
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibpangomm1-4-1
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibpangocairo1-0-0
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibgdkmm2-4-1 += CSWlibgio2-0-0
-PACKAGES = CSWlibgiomm2-4-1
-SPKG_DESC_CSWlibgiomm2-4-1 = $(DESCRIPTION), libgiomm-2.4.so.1
-PKGFILES_CSWlibgiomm2-4-1 = $(call pkgfiles_lib,libgiomm-2.4.so.1)
-RUNTIME_DEP_PKGS_CSWlibgiomm2-4-1 += CSWlibsigc2-0-0
-RUNTIME_DEP_PKGS_CSWlibgiomm2-4-1 += CSWlibglibmm2-4-1
-RUNTIME_DEP_PKGS_CSWlibgiomm2-4-1 += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibgiomm2-4-1 += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibgiomm2-4-1 += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWlibgiomm2-4-1 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibgiomm2-4-1 += CSWlibglib2-0-0
-# Remove once ld -z ignore issue has been resolved on sparc
-RUNTIME_DEP_PKGS_CSWlibgiomm2-4-1 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgiomm2-4-1 += CSWlibgmodule2-0-0
-CHECKPKG_OVERRIDES_CSWlibgiomm2-4-1 += surplus-dependency|CSWlibgmodule2-0-0
-CHECKPKG_OVERRIDES_CSWlibgiomm2-4-1 += surplus-dependency|CSWlibintl8
+PACKAGES += CSWlibgtkmm2-4-1
+SPKG_DESC_CSWlibgtkmm2-4-1 = C++ interface to gtk2, libgtkmm-2.4.so.1
+PKGFILES_CSWlibgtkmm2-4-1 += $(call pkgfiles_lib,libgtkmm-2.4.so.1)
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibgdkmm2-4-1
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibpangomm1-4-1
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibgiomm2-4-1
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibatkmm1-6-1
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibpangoft2-1-0-0
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibglibmm2-4-1
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibcairomm1-0-1
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibsigc2-0-0
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibpangocairo1-0-0
+RUNTIME_DEP_PKGS_CSWlibgtkmm2-4-1 += CSWlibglib2-0-0
-PACKAGES += CSWlibglibmm2-4-1
-SPKG_DESC_CSWlibglibmm2-4-1 = $(DESCRIPTION), libglibmm-2.4.so.1
-PKGFILES_CSWlibglibmm2-4-1 = $(call pkgfiles_lib,libglibmm-2.4.so.1)
-RUNTIME_DEP_PKGS_CSWlibglibmm2-4-1 += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWlibglibmm2-4-1 += CSWlibsigc2-0-0
-RUNTIME_DEP_PKGS_CSWlibglibmm2-4-1 += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibglibmm2-4-1 += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibglibmm2-4-1 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibglibmm2-4-1 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibglibmm2-4-1 += CSWlibintl8
-CHECKPKG_OVERRIDES_CSWlibglibmm2-4-1 += surplus-dependency|CSWlibintl8
+PACKAGES += CSWlibgtkmm-dev
+SPKG_DESC_CSWlibgtkmm-dev = Development files for libgtkmm-2.4.so.1 and libgdkmm-2.4.so.1
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibgtkmm-dev += CSWlibgdkmm2-4-1
+RUNTIME_DEP_PKGS_CSWlibgtkmm-dev += CSWlibgtkmm2-4-1
-# Had to shorten package name :/
-PACKAGES += CSWlibglibmm-extra-defs2-4-1
-SPKG_DESC_CSWlibglibmm-extra-defs2-4-1 = $(DESCRIPTION), libglibmm_generate_extra_defs-2.4.so.1
-PKGFILES_CSWlibglibmm-extra-defs2-4-1 = $(call pkgfiles_lib,libglibmm_generate_extra_defs-2.4.so.1)
-RUNTIME_DEP_PKGS_CSWlibglibmm-extra-defs2-4-1 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibglibmm-extra-defs2-4-1 += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibglibmm-extra-defs2-4-1 += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibglibmm-extra-defs2-4-1 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibglibmm-extra-defs2-4-1 += CSWlibintl8
-CHECKPKG_OVERRIDES_CSWlibglibmm-extra-defs2-4-1 += surplus-dependency|CSWlibintl8
-# Package name would be too long
-CHECKPKG_OVERRIDES_CSWlibglibmm-extra-defs2-4-1 += shared-lib-pkgname-mismatch
+# This is from a comment
+CHECKPKG_OVERRIDES_CSWlibgtkmm-dev += file-with-bad-content|/usr/share|root/opt/csw/include/gtkmm-2.4/gtkmm/filechooser.h
-PACKAGES += CSWlibglibmm-dev
-SPKG_DESC_CSWlibglibmm-dev = $(DESCRIPTION), development files
-PKGFILES_CSWlibglibmm-dev = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibglibmm-dev += .*/lib/(.*/|)giomm-2.4.*
-PKGFILES_CSWlibglibmm-dev += .*/lib/(.*/|)glibmm-2.4.*
-RUNTIME_DEP_PKGS_CSWlibglibmm-dev = CSWlibglib2-dev
-RUNTIME_DEP_PKGS_CSWlibglibmm-dev += CSWlibglibmm-extra-defs2-4-1
-RUNTIME_DEP_PKGS_CSWlibglibmm-dev += CSWlibgiomm2-4-1
-RUNTIME_DEP_PKGS_CSWlibglibmm-dev += CSWlibglibmm2-4-1
-RUNTIME_DEP_PKGS_CSWlibglibmm-dev += CSWperl
-# Nothing to worry, just in a comment
-CHECKPKG_OVERRIDES_CSWlibglibmm-dev += file-with-bad-content|/usr/local|root/opt/csw/include/glibmm-2.4/glibmm/miscutils.h
+GARCOMPILER = GNU
-PACKAGES += CSWglibmm-doc
-ARCHALL_CSWglibmm-doc = 1
-SPKG_DESC_CSWglibmm-doc = $(DESCRIPTION), documentation
-# Catch all
-
-
BUILD64_LIBS_ONLY = 1
EXTRA_CONFIGURE_EXPORTS += MAKE
CONFIGURE_ENV_MAKE = gmake
-# Some test rely on gthread, but do not pull it in.
-EXTRA_LINKER_FLAGS = -lgthread-2.0
-
include gar/category.mk
Modified: csw/mgar/pkg/gtkmm/trunk/checksums
===================================================================
--- csw/mgar/pkg/glibmm/trunk/checksums 2013-11-05 21:55:04 UTC (rev 22414)
+++ csw/mgar/pkg/gtkmm/trunk/checksums 2013-11-07 10:35:20 UTC (rev 22437)
@@ -1 +1 @@
-7bbc4ad1c4f79dec0ee79e6daea4bb03 glibmm-2.28.2.tar.xz
+b9ac60c90959a71095f07f84dd39961d gtkmm-2.24.4.tar.xz
Deleted: csw/mgar/pkg/gtkmm/trunk/files/0001-Fix-disable-tests-1.patch
===================================================================
--- csw/mgar/pkg/glibmm/trunk/files/0001-Fix-disable-tests-1.patch 2013-11-05 21:55:04 UTC (rev 22414)
+++ csw/mgar/pkg/gtkmm/trunk/files/0001-Fix-disable-tests-1.patch 2013-11-07 10:35:20 UTC (rev 22437)
@@ -1,43 +0,0 @@
-From 76346c41c0c81f4d26202e461b45ebf8b3341495 Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <raos at opencsw.org>
-Date: Tue, 5 Nov 2013 17:08:44 +0100
-Subject: [PATCH] Fix/disable tests 1
-
----
- tests/giomm_simple/main.cc | 5 ++++-
- tests/glibmm_ustring_format/main.cc | 3 +++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/tests/giomm_simple/main.cc b/tests/giomm_simple/main.cc
-index 35f5cbf..979d17f 100644
---- a/tests/giomm_simple/main.cc
-+++ b/tests/giomm_simple/main.cc
-@@ -16,7 +16,10 @@ int main(int, char**)
-
- try
- {
-- Glib::RefPtr<Gio::File> file = Gio::File::create_for_path("/etc/fstab");
-+ /* YES! Take something that's guaranteed to exist on every system, such as /etc/fstab.
-+ Oh, wait, Solaris has no /etc/fstab.
-+ */
-+ Glib::RefPtr<Gio::File> file = Gio::File::create_for_path("/etc/hosts");
- if(!file)
- {
- std::cerr << "Gio::File::create_for_path() returned an empty RefPtr." << std::endl;
-diff --git a/tests/glibmm_ustring_format/main.cc b/tests/glibmm_ustring_format/main.cc
-index 3f44a53..54d5b3f 100644
---- a/tests/glibmm_ustring_format/main.cc
-+++ b/tests/glibmm_ustring_format/main.cc
-@@ -4,6 +4,9 @@
-
- int main(int, char**)
- {
-+ /* Test Fails on Solaris 10 */
-+ return EXIT_SUCCESS;
-+
- Glib::init();
-
- char carr[10] = "Užduotys";
---
-1.8.4.1
-
Deleted: csw/mgar/pkg/gtkmm/trunk/files/0003-Disable-Tests-2.patch
===================================================================
--- csw/mgar/pkg/glibmm/trunk/files/0003-Disable-Tests-2.patch 2013-11-05 21:55:04 UTC (rev 22414)
+++ csw/mgar/pkg/gtkmm/trunk/files/0003-Disable-Tests-2.patch 2013-11-07 10:35:20 UTC (rev 22437)
@@ -1,42 +0,0 @@
-From 22d53d5ce389147b6ef68ef33f9579e96157c4df Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <raos at opencsw.org>
-Date: Tue, 5 Nov 2013 18:13:39 +0100
-Subject: [PATCH] Disable Tests 2
-
----
- tests/giomm_ioerror_and_iodbuserror/main.cc | 4 ++++
- tests/glibmm_variant/main.cc | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/tests/giomm_ioerror_and_iodbuserror/main.cc b/tests/giomm_ioerror_and_iodbuserror/main.cc
-index 1e7dbc6..3eaa10b 100644
---- a/tests/giomm_ioerror_and_iodbuserror/main.cc
-+++ b/tests/giomm_ioerror_and_iodbuserror/main.cc
-@@ -10,6 +10,10 @@
-
- int main(int, char**)
- {
-+
-+ /* Fails on amd64 */
-+ return EXIT_SUCCESS;
-+
- Glib::init();
- Gio::init();
-
-diff --git a/tests/glibmm_variant/main.cc b/tests/glibmm_variant/main.cc
-index 816406e..fd58543 100644
---- a/tests/glibmm_variant/main.cc
-+++ b/tests/glibmm_variant/main.cc
-@@ -12,6 +12,9 @@ static void test_dynamic_cast();
-
- int main(int, char**)
- {
-+ /* Fails on amd64 */
-+ return EXIT_SUCCESS;
-+
- Glib::init();
-
- const int int_list[] = {1, 2, 3, 4, 5, 6, 7, 8};
---
-1.8.4.1
-
Deleted: csw/mgar/pkg/gtkmm/trunk/files/0003-Use-etc-hosts-instead-of-etc-fstab-in-test.patch
===================================================================
--- csw/mgar/pkg/glibmm/trunk/files/0003-Use-etc-hosts-instead-of-etc-fstab-in-test.patch 2013-11-05 21:55:04 UTC (rev 22414)
+++ csw/mgar/pkg/gtkmm/trunk/files/0003-Use-etc-hosts-instead-of-etc-fstab-in-test.patch 2013-11-07 10:35:20 UTC (rev 22437)
@@ -1,25 +0,0 @@
-From 5f8d95da8791e57e9d3ec280447269ac3b50a18e Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <raos at opencsw.org>
-Date: Tue, 5 Nov 2013 18:47:21 +0100
-Subject: [PATCH] Use /etc/hosts instead of /etc/fstab in test
-
----
- tests/giomm_ioerror/main.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/giomm_ioerror/main.cc b/tests/giomm_ioerror/main.cc
-index 0a44d33..135275f 100644
---- a/tests/giomm_ioerror/main.cc
-+++ b/tests/giomm_ioerror/main.cc
-@@ -28,7 +28,7 @@ int main(int, char**)
-
- try
- {
-- Glib::RefPtr<Gio::File> file = Gio::File::create_for_path("/etc/fstab");
-+ Glib::RefPtr<Gio::File> file = Gio::File::create_for_path("/etc/hosts");
- if(!file)
- {
- std::cerr << "Gio::File::create_for_path() returned an empty RefPtr." << std::endl;
---
-1.8.4.1
-
Deleted: csw/mgar/pkg/gtkmm/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/glibmm/trunk/files/changelog.CSW 2013-11-05 21:55:04 UTC (rev 22414)
+++ csw/mgar/pkg/gtkmm/trunk/files/changelog.CSW 2013-11-07 10:35:20 UTC (rev 22437)
@@ -1,5 +0,0 @@
-glibmm (2.28.2,REV=2013.11.05)
-
- * Initial release.
-
- -- Rafael Ostertag <raos at opencsw.org> Tue, 05 Nov 2013 20:45:37 +0100
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list