- update to 1.19.12
This commit is contained in:
jasper
parent
234027bfe0
commit
289afec95b
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.3 2011/10/03 12:10:30 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.4 2011/10/10 20:14:17 jasper Exp $
|
||||
|
||||
COMMENT= GNOME database designer and user interface
|
||||
|
||||
GNOME_PROJECT= glom
|
||||
GNOME_VERSION= 1.19.11
|
||||
REVISION= 1
|
||||
GNOME_VERSION= 1.19.12
|
||||
|
||||
# XXX https://bugzilla.gnome.org/show_bug.cgi?id=619445
|
||||
PATCHFILES= glom_locale.patch:0
|
||||
@ -58,7 +57,7 @@ RUN_DEPENDS= databases/postgresql,-server \
|
||||
x11/gnome/libgda>=4.99.4p2
|
||||
LIB_DEPENDS= devel/boost \
|
||||
graphics/evince \
|
||||
graphics/goocanvasmm2 \
|
||||
graphics/goocanvasmm2>=1.90.6 \
|
||||
net/libepc \
|
||||
textproc/libxml++ \
|
||||
x11/gnome/libgda,-pgsql \
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
MD5 (gnome/glom-1.19.11.tar.xz) = 2G34Puu+tGc/YUC5eCEkyQ==
|
||||
MD5 (gnome/glom-1.19.12.tar.xz) = qHFcObv+CF4nx3feWjUO+A==
|
||||
MD5 (gnome/glom_locale.patch) = u4ezDZ1eHi86gL2NMC2KtA==
|
||||
RMD160 (gnome/glom-1.19.11.tar.xz) = nylZ6V8hfcqIypHWhs7KGj5eSE0=
|
||||
RMD160 (gnome/glom-1.19.12.tar.xz) = UMqalGj2WzBtfGGh790g7t4YVgE=
|
||||
RMD160 (gnome/glom_locale.patch) = 1T9xHTC66olyihGRyle9uqfNiEk=
|
||||
SHA1 (gnome/glom-1.19.11.tar.xz) = ncXNxwS5jhA3XcNKXZP9BKaJzTE=
|
||||
SHA1 (gnome/glom-1.19.12.tar.xz) = wZOlEA2J/uwfBtohMD8ZXVw7NG4=
|
||||
SHA1 (gnome/glom_locale.patch) = 83VWojeIBCVwTmP/RyUXb29i5Uo=
|
||||
SHA256 (gnome/glom-1.19.11.tar.xz) = wo6tizfTFVDClQBN5Q4NwJ3r069mVpG4UnNzML9oUU0=
|
||||
SHA256 (gnome/glom-1.19.12.tar.xz) = NnceCoszZzZM2E5sipvWqbbJeVMiDVfRwZXFvvNwFXU=
|
||||
SHA256 (gnome/glom_locale.patch) = t1XxSaoZzXT1mEEQnVHAh9zRcdhdxFYK6NoCswUNuK0=
|
||||
SIZE (gnome/glom-1.19.11.tar.xz) = 9258320
|
||||
SIZE (gnome/glom-1.19.12.tar.xz) = 9238572
|
||||
SIZE (gnome/glom_locale.patch) = 7587
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
$OpenBSD: patch-glom_application_cc,v 1.1.1.1 2011/09/29 17:19:28 jasper Exp $
|
||||
|
||||
From ff21cc98a1d1f3c57f6e3527d6c60c6dacba4f7d Mon Sep 17 00:00:00 2001
|
||||
From: Murray Cumming <murrayc@murrayc.com>
|
||||
Date: Wed, 21 Sep 2011 09:06:31 +0000
|
||||
Subject: Avoid "m_backend is NULL" warning at startup.
|
||||
|
||||
--- glom/application.cc.orig Tue Sep 13 09:11:47 2011
|
||||
+++ glom/application.cc Thu Sep 29 17:14:06 2011
|
||||
@@ -1412,14 +1412,17 @@ void Application::update_userlevel_ui()
|
||||
// support users
|
||||
if(userlevel == AppState::USERLEVEL_DEVELOPER)
|
||||
{
|
||||
- sharedptr<SharedConnection> connection = ConnectionPool::get_and_connect();
|
||||
- if(connection && !connection->get_gda_connection()->supports_feature(Gnome::Gda::CONNECTION_FEATURE_USERS))
|
||||
- m_action_developer_users->set_sensitive(false);
|
||||
+ if(ConnectionPool::get_instance_is_ready())
|
||||
+ {
|
||||
+ sharedptr<SharedConnection> connection = ConnectionPool::get_and_connect();
|
||||
+ if(connection && !connection->get_gda_connection()->supports_feature(Gnome::Gda::CONNECTION_FEATURE_USERS))
|
||||
+ m_action_developer_users->set_sensitive(false);
|
||||
+ }
|
||||
}
|
||||
|
||||
//Make sure that the correct radio menu item is activated (the userlevel might have been set programmatically):
|
||||
//We only need to set/unset one, because the others are in the same radio group.
|
||||
- if(userlevel == AppState::USERLEVEL_DEVELOPER)
|
||||
+ if(userlevel == AppState::USERLEVEL_DEVELOPER)
|
||||
{
|
||||
if(!m_action_menu_developer_developer->get_active())
|
||||
m_action_menu_developer_developer->set_active();
|
||||
@ -1,38 +0,0 @@
|
||||
$OpenBSD: patch-glom_libglom_connectionpool_cc,v 1.1.1.1 2011/09/29 17:19:28 jasper Exp $
|
||||
|
||||
From ff21cc98a1d1f3c57f6e3527d6c60c6dacba4f7d Mon Sep 17 00:00:00 2001
|
||||
From: Murray Cumming <murrayc@murrayc.com>
|
||||
Date: Wed, 21 Sep 2011 09:06:31 +0000
|
||||
Subject: Avoid "m_backend is NULL" warning at startup.
|
||||
|
||||
--- glom/libglom/connectionpool.cc.orig Fri Sep 9 14:37:11 2011
|
||||
+++ glom/libglom/connectionpool.cc Thu Sep 29 17:28:47 2011
|
||||
@@ -225,8 +225,16 @@ sharedptr<SharedConnection> ConnectionPool::get_and_co
|
||||
return result;
|
||||
}
|
||||
|
||||
+bool ConnectionPool::get_instance_is_ready()
|
||||
+{
|
||||
+ ConnectionPool* instance = get_instance();
|
||||
+ if(!instance)
|
||||
+ return false;
|
||||
|
||||
+ return instance->get_ready_to_connect();
|
||||
+}
|
||||
|
||||
+
|
||||
// Store the connection for a few seconds in case it
|
||||
// is immediately requested again, to avoid making a new connection
|
||||
// and introspecting again, which is slow.
|
||||
@@ -547,8 +555,10 @@ bool ConnectionPool::handle_error_cerr_only()
|
||||
#ifdef G_OS_WIN32
|
||||
// TODO: This is probably mingw specific
|
||||
static __p_sig_fn_t previous_sig_handler = SIG_DFL;
|
||||
-#else
|
||||
+#elif defined(__linux__)
|
||||
static sighandler_t previous_sig_handler = SIG_DFL; /* Arbitrary default */
|
||||
+#else
|
||||
+static sig_t previous_sig_handler = SIG_DFL;
|
||||
#endif
|
||||
|
||||
/* This is a Linux/Unix signal handler,
|
||||
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-glom_libglom_connectionpool_h,v 1.1.1.1 2011/09/29 17:19:28 jasper Exp $
|
||||
|
||||
From ff21cc98a1d1f3c57f6e3527d6c60c6dacba4f7d Mon Sep 17 00:00:00 2001
|
||||
From: Murray Cumming <murrayc@murrayc.com>
|
||||
Date: Wed, 21 Sep 2011 09:06:31 +0000
|
||||
Subject: Avoid "m_backend is NULL" warning at startup.
|
||||
|
||||
--- glom/libglom/connectionpool.h.orig Mon Jun 27 10:48:32 2011
|
||||
+++ glom/libglom/connectionpool.h Thu Sep 29 17:14:06 2011
|
||||
@@ -98,6 +98,10 @@ class ConnectionPool : public sigc::trackable (public)
|
||||
* Use delete_instance() when the program quits.
|
||||
*/
|
||||
static ConnectionPool* get_instance();
|
||||
+
|
||||
+ /** Whether the connection is ready to be used.
|
||||
+ */
|
||||
+ static bool get_instance_is_ready();
|
||||
|
||||
/** Make the ConnectionPool use the correct backend, with the necessary details,
|
||||
* as required by the document.
|
||||
@ -1,41 +0,0 @@
|
||||
$OpenBSD: patch-glom_main_cc,v 1.2 2011/09/29 20:57:45 jasper Exp $
|
||||
|
||||
From bf111b2f3d39fa8aa27a6b3e6778ae8f987cad8f Mon Sep 17 00:00:00 2001
|
||||
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
|
||||
Date: Thu, 29 Sep 2011 20:54:56 +0000
|
||||
Subject: Hide __libc_freeres on system which don't have glibc.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=660496
|
||||
|
||||
--- glom/main.cc.orig Thu Sep 29 14:32:56 2011
|
||||
+++ glom/main.cc Thu Sep 29 14:33:56 2011
|
||||
@@ -373,18 +373,19 @@ bool check_pygda_is_available_with_warning()
|
||||
|
||||
} //namespace Glom
|
||||
|
||||
-#ifndef G_OS_WIN32
|
||||
+#ifdef __linux__
|
||||
extern "C" void __libc_freeres(void);
|
||||
#endif
|
||||
|
||||
int
|
||||
main(int argc, char* argv[])
|
||||
{
|
||||
-#ifndef G_OS_WIN32
|
||||
+#ifdef __linux__
|
||||
//Force some cleanup at exit,
|
||||
//to help valgrind to detect memory leaks:
|
||||
atexit(__libc_freeres);
|
||||
#else
|
||||
+# ifdef G_OS_WIN32
|
||||
WSADATA data;
|
||||
int errcode = WSAStartup(MAKEWORD(2, 0), &data);
|
||||
if(errcode != 0)
|
||||
@@ -396,6 +397,7 @@ main(int argc, char* argv[])
|
||||
gchar* installation_dir_c = g_win32_get_package_installation_directory_of_module(0);
|
||||
const std::string installation_dir(installation_dir_c);
|
||||
g_free(installation_dir_c);
|
||||
+# endif
|
||||
#endif
|
||||
|
||||
// TODO: I am not sure why, but this does not work. PYTHONPATH is set
|
||||
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-glom_mode_data_datawidget_dialog_choose_id_cc,v 1.1.1.1 2011/09/29 17:19:28 jasper Exp $
|
||||
|
||||
From 5cf223201ece3534ab177e7eaaa75322542e8bec Mon Sep 17 00:00:00 2001
|
||||
From: Murray Cumming <murrayc@murrayc.com>
|
||||
Date: Thu, 29 Sep 2011 10:18:31 +0000
|
||||
Subject: Dialog_Choose_ID: Work around a crash in GTK+.
|
||||
|
||||
--- glom/mode_data/datawidget/dialog_choose_id.cc.orig Thu Sep 29 14:08:16 2011
|
||||
+++ glom/mode_data/datawidget/dialog_choose_id.cc Thu Sep 29 14:09:02 2011
|
||||
@@ -72,6 +72,10 @@ Dialog_ChooseID::~Dialog_ChooseID()
|
||||
{
|
||||
remove_view(&m_box_find);
|
||||
remove_view(&m_box_select);
|
||||
+
|
||||
+ //Work around this bug (apparently in GTK+):
|
||||
+ //https://bugzilla.gnome.org/show_bug.cgi?id=660347
|
||||
+ m_alignment_parent->remove();
|
||||
}
|
||||
|
||||
void Dialog_ChooseID::setup()
|
||||
@ -1,5 +1,6 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2011/09/29 17:19:29 jasper Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2011/10/10 20:14:17 jasper Exp $
|
||||
@bin bin/glom
|
||||
@bin bin/glom_create_from_example
|
||||
include/glom-${API_V}/
|
||||
include/glom-${API_V}/libglom/
|
||||
include/glom-${API_V}/libglom/appstate.h
|
||||
@ -429,8 +430,6 @@ share/glom/pixmaps/glom-text.png
|
||||
share/glom/xslt/
|
||||
share/glom/xslt/print_details_to_html.xsl
|
||||
share/glom/xslt/print_report_to_html.xsl
|
||||
share/gnome/
|
||||
share/gnome/help/
|
||||
share/gnome/help/glom/
|
||||
share/gnome/help/glom/C/
|
||||
share/gnome/help/glom/C/figures/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user