Update to 0.62:
For Release 0.62 ---------------- - Support Mergeant MIME type (Rodrigo) - Build fixes (Rodrigo) - Fixed desktop file installation dir (Rodrigo) - Fixed #311572 (Rodrigo) - Adapted to libgda/libgnomedb 1.3.90 APIs (Vivien) - Updated translations: - en_CA (Adam) - fr (Christophe) - nb (Kjartan) - no (Kjartan) - pt_BR (Raphael) - vi (Clytie) - Added translations: - ne (Pawan) For Release 0.61 ---------------- - Explicitly require libgda/libgnomedb-2.0 (Rodrigo) - Use GType for GObject-based classes, not guint (Vivien) For Release 0.60 ---------------- - Added many command line arguments to specify Mergeant's start configuration (username, password, data source, etc) (Vivien) - Improved connection dialog (Vivien) - Display information about data types synonyms (Vivien) - Added an SQL console to direclty send SQL statements to the DBMS server (Vivien) - Removed bonobo dependencies (Vivien) - Merged the libmergeant library into Libgnomedb (Vivien) - Many GUI improvements (Rodrigo, Vivien) - Many, many small improvements and bug fixes - Updated translations - Added translations: - Lithuanian (Žygimantas BeruÄka) - Kinyarwanda (Steve Murphy) - Japanese (Takeshi AIHANA) - Norwegian (Kjartan Maraas)
This commit is contained in:
wiz
parent
d634f4451e
commit
d42fdee9ac
10 changed files with 34 additions and 358 deletions
|
|
@ -1,10 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.33 2006/01/24 07:31:59 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.34 2006/02/04 17:03:30 wiz Exp $
|
||||
#
|
||||
|
||||
DISTNAME= mergeant-0.52
|
||||
PKGREVISION= 2
|
||||
DISTNAME= mergeant-0.62
|
||||
CATEGORIES= databases gnome
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/mergeant/0.52/}
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/mergeant/0.62/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= tech-pkg@NetBSD.org
|
||||
|
|
@ -27,6 +26,7 @@ USE_LIBTOOL= YES
|
|||
.include "../../devel/libgnomeui/buildlink3.mk"
|
||||
.include "../../print/libgnomeprint/buildlink3.mk"
|
||||
.include "../../print/libgnomeprintui/buildlink3.mk"
|
||||
.include "../../textproc/intltool/buildlink3.mk"
|
||||
.include "../../textproc/libxml2/buildlink3.mk"
|
||||
.include "../../textproc/scrollkeeper/omf.mk"
|
||||
.include "../../x11/gtk2/buildlink3.mk"
|
||||
|
|
|
|||
|
|
@ -1,206 +1,8 @@
|
|||
@comment $NetBSD: PLIST,v 1.5 2005/02/24 19:18:57 drochner Exp $
|
||||
@comment $NetBSD: PLIST,v 1.6 2006/02/04 17:03:30 wiz Exp $
|
||||
bin/mergeant
|
||||
bin/mg-db-browser
|
||||
bin/mg-test-dyn
|
||||
bin/mg-test-graph
|
||||
bin/mg-test-grapher
|
||||
bin/mg-test-handlers
|
||||
bin/mg-test-selector
|
||||
bin/mg-test-sqlquery
|
||||
bin/mg-test1
|
||||
bin/mg-test2
|
||||
bin/mg-test3
|
||||
bin/mg-verify-file
|
||||
include/libmergeant/graph/mg-canvas-cursor.h
|
||||
include/libmergeant/graph/mg-canvas-db-relations.h
|
||||
include/libmergeant/graph/mg-canvas-entity.h
|
||||
include/libmergeant/graph/mg-canvas-field.h
|
||||
include/libmergeant/graph/mg-canvas-fkconstraint.h
|
||||
include/libmergeant/graph/mg-canvas-item.h
|
||||
include/libmergeant/graph/mg-canvas-text.h
|
||||
include/libmergeant/graph/mg-canvas-tip.h
|
||||
include/libmergeant/graph/mg-canvas.h
|
||||
include/libmergeant/graph/mg-graph-item.h
|
||||
include/libmergeant/graph/mg-graph.h
|
||||
include/libmergeant/handlers/mg-data-cell-renderer-boolean.h
|
||||
include/libmergeant/handlers/mg-data-cell-renderer-combo.h
|
||||
include/libmergeant/handlers/mg-data-cell-renderer-info.h
|
||||
include/libmergeant/handlers/mg-data-cell-renderer-textual.h
|
||||
include/libmergeant/handlers/mg-entry-boolean.h
|
||||
include/libmergeant/handlers/mg-entry-combo.h
|
||||
include/libmergeant/handlers/mg-entry-none.h
|
||||
include/libmergeant/handlers/mg-entry-shell.h
|
||||
include/libmergeant/handlers/mg-entry-string.h
|
||||
include/libmergeant/handlers/mg-entry-time.h
|
||||
include/libmergeant/handlers/mg-entry-wrapper.h
|
||||
include/libmergeant/handlers/mg-handler-boolean.h
|
||||
include/libmergeant/handlers/mg-handler-none.h
|
||||
include/libmergeant/handlers/mg-handler-numerical.h
|
||||
include/libmergeant/handlers/mg-handler-string.h
|
||||
include/libmergeant/handlers/mg-handler-time.h
|
||||
include/libmergeant/libmergeant.h
|
||||
include/libmergeant/marshal.h
|
||||
include/libmergeant/mg-base.h
|
||||
include/libmergeant/mg-condition.h
|
||||
include/libmergeant/mg-conf.h
|
||||
include/libmergeant/mg-context.h
|
||||
include/libmergeant/mg-custom-layout.h
|
||||
include/libmergeant/mg-data-entry.h
|
||||
include/libmergeant/mg-data-handler.h
|
||||
include/libmergeant/mg-database.h
|
||||
include/libmergeant/mg-db-constraint.h
|
||||
include/libmergeant/mg-db-field.h
|
||||
include/libmergeant/mg-db-table.h
|
||||
include/libmergeant/mg-dbms-update-viewer.h
|
||||
include/libmergeant/mg-defs.h
|
||||
include/libmergeant/mg-entity.h
|
||||
include/libmergeant/mg-enums.h
|
||||
include/libmergeant/mg-field.h
|
||||
include/libmergeant/mg-form.h
|
||||
include/libmergeant/mg-graphviz.h
|
||||
include/libmergeant/mg-join.h
|
||||
include/libmergeant/mg-parameter.h
|
||||
include/libmergeant/mg-qf-all.h
|
||||
include/libmergeant/mg-qf-field.h
|
||||
include/libmergeant/mg-qf-func.h
|
||||
include/libmergeant/mg-qf-value.h
|
||||
include/libmergeant/mg-qfield.h
|
||||
include/libmergeant/mg-query.h
|
||||
include/libmergeant/mg-ref-base.h
|
||||
include/libmergeant/mg-referer.h
|
||||
include/libmergeant/mg-renderer.h
|
||||
include/libmergeant/mg-result-set.h
|
||||
include/libmergeant/mg-selector-private.h
|
||||
include/libmergeant/mg-selector.h
|
||||
include/libmergeant/mg-server-aggregate.h
|
||||
include/libmergeant/mg-server-data-type.h
|
||||
include/libmergeant/mg-server-function.h
|
||||
include/libmergeant/mg-server.h
|
||||
include/libmergeant/mg-target.h
|
||||
include/libmergeant/mg-util.h
|
||||
include/libmergeant/mg-work-core.h
|
||||
include/libmergeant/mg-work-form.h
|
||||
include/libmergeant/mg-work-grid.h
|
||||
include/libmergeant/mg-work-layout.h
|
||||
include/libmergeant/mg-work-matrix.h
|
||||
include/libmergeant/mg-work-widget.h
|
||||
include/libmergeant/mg-xml-storage.h
|
||||
include/libmergeant/missing.h
|
||||
include/libmergeant/sel-aggregates.h
|
||||
include/libmergeant/sel-data-types.h
|
||||
include/libmergeant/sel-forms.h
|
||||
include/libmergeant/sel-functions.h
|
||||
include/libmergeant/sel-graphs.h
|
||||
include/libmergeant/sel-onequery.h
|
||||
include/libmergeant/sel-onetable.h
|
||||
include/libmergeant/sel-onetarget.h
|
||||
include/libmergeant/sel-queries.h
|
||||
include/libmergeant/sel-tables.h
|
||||
include/libmergeant/utility.h
|
||||
lib/bonobo/servers/GNOME_Mergeant.server
|
||||
lib/libmergeant-2.la
|
||||
lib/libmergeant_graph-2.la
|
||||
lib/libmergeant_handlers-2.la
|
||||
lib/pkgconfig/libmergeant.pc
|
||||
share/application-registry/mergeant.applications
|
||||
share/applications/mergeant.desktop
|
||||
share/doc/html/libmergeant/MgBase.html
|
||||
share/doc/html/libmergeant/MgCanvas.html
|
||||
share/doc/html/libmergeant/MgCanvasCursor.html
|
||||
share/doc/html/libmergeant/MgCanvasDbRelations.html
|
||||
share/doc/html/libmergeant/MgCanvasEntity.html
|
||||
share/doc/html/libmergeant/MgCanvasField.html
|
||||
share/doc/html/libmergeant/MgCanvasItem.html
|
||||
share/doc/html/libmergeant/MgCanvasText.html
|
||||
share/doc/html/libmergeant/MgCanvasTip.html
|
||||
share/doc/html/libmergeant/MgCondition.html
|
||||
share/doc/html/libmergeant/MgConf.html
|
||||
share/doc/html/libmergeant/MgContext.html
|
||||
share/doc/html/libmergeant/MgCustomLayout.html
|
||||
share/doc/html/libmergeant/MgDataCellRendererBoolean.html
|
||||
share/doc/html/libmergeant/MgDataCellRendererInfo.html
|
||||
share/doc/html/libmergeant/MgDataCellRendererTextual.html
|
||||
share/doc/html/libmergeant/MgDataEntry.html
|
||||
share/doc/html/libmergeant/MgDataHandler.html
|
||||
share/doc/html/libmergeant/MgDatabase.html
|
||||
share/doc/html/libmergeant/MgDbConstraint.html
|
||||
share/doc/html/libmergeant/MgDbField.html
|
||||
share/doc/html/libmergeant/MgDbTable.html
|
||||
share/doc/html/libmergeant/MgDbmsUpdateViewer.html
|
||||
share/doc/html/libmergeant/MgEntity.html
|
||||
share/doc/html/libmergeant/MgEntryBoolean.html
|
||||
share/doc/html/libmergeant/MgEntryCidr.html
|
||||
share/doc/html/libmergeant/MgEntryCombo.html
|
||||
share/doc/html/libmergeant/MgEntryNone.html
|
||||
share/doc/html/libmergeant/MgEntryPassmd5.html
|
||||
share/doc/html/libmergeant/MgEntryShell.html
|
||||
share/doc/html/libmergeant/MgEntryString.html
|
||||
share/doc/html/libmergeant/MgEntryTime.html
|
||||
share/doc/html/libmergeant/MgEntryWrapper.html
|
||||
share/doc/html/libmergeant/MgField.html
|
||||
share/doc/html/libmergeant/MgForm.html
|
||||
share/doc/html/libmergeant/MgGraph.html
|
||||
share/doc/html/libmergeant/MgGraphItem.html
|
||||
share/doc/html/libmergeant/MgGraphviz.html
|
||||
share/doc/html/libmergeant/MgHandlerBoolean.html
|
||||
share/doc/html/libmergeant/MgHandlerCidr.html
|
||||
share/doc/html/libmergeant/MgHandlerNone.html
|
||||
share/doc/html/libmergeant/MgHandlerNumerical.html
|
||||
share/doc/html/libmergeant/MgHandlerPassmd5.html
|
||||
share/doc/html/libmergeant/MgHandlerString.html
|
||||
share/doc/html/libmergeant/MgHandlerText.html
|
||||
share/doc/html/libmergeant/MgHandlerTime.html
|
||||
share/doc/html/libmergeant/MgJoin.html
|
||||
share/doc/html/libmergeant/MgParameter.html
|
||||
share/doc/html/libmergeant/MgQfAll.html
|
||||
share/doc/html/libmergeant/MgQfField.html
|
||||
share/doc/html/libmergeant/MgQfFunc.html
|
||||
share/doc/html/libmergeant/MgQfValue.html
|
||||
share/doc/html/libmergeant/MgQfield.html
|
||||
share/doc/html/libmergeant/MgQuery.html
|
||||
share/doc/html/libmergeant/MgRefBase.html
|
||||
share/doc/html/libmergeant/MgReferer.html
|
||||
share/doc/html/libmergeant/MgRenderer.html
|
||||
share/doc/html/libmergeant/MgResultSet.html
|
||||
share/doc/html/libmergeant/MgSelector.html
|
||||
share/doc/html/libmergeant/MgServer.html
|
||||
share/doc/html/libmergeant/MgServerAggregate.html
|
||||
share/doc/html/libmergeant/MgServerDataType.html
|
||||
share/doc/html/libmergeant/MgServerFunction.html
|
||||
share/doc/html/libmergeant/MgTarget.html
|
||||
share/doc/html/libmergeant/MgWorkCore.html
|
||||
share/doc/html/libmergeant/MgWorkForm.html
|
||||
share/doc/html/libmergeant/MgWorkGrid.html
|
||||
share/doc/html/libmergeant/MgWorkLayout.html
|
||||
share/doc/html/libmergeant/MgWorkMatrix.html
|
||||
share/doc/html/libmergeant/MgWorkWidget.html
|
||||
share/doc/html/libmergeant/MgXmlStorage.html
|
||||
share/doc/html/libmergeant/ch01.html
|
||||
share/doc/html/libmergeant/ch02.html
|
||||
share/doc/html/libmergeant/ch03.html
|
||||
share/doc/html/libmergeant/ch04.html
|
||||
share/doc/html/libmergeant/ch04s02.html
|
||||
share/doc/html/libmergeant/ch05.html
|
||||
share/doc/html/libmergeant/ch06.html
|
||||
share/doc/html/libmergeant/ch07.html
|
||||
share/doc/html/libmergeant/ch08.html
|
||||
share/doc/html/libmergeant/ch08s02.html
|
||||
share/doc/html/libmergeant/ch09.html
|
||||
share/doc/html/libmergeant/ch09s02.html
|
||||
share/doc/html/libmergeant/ch09s03.html
|
||||
share/doc/html/libmergeant/ch10.html
|
||||
share/doc/html/libmergeant/ch11.html
|
||||
share/doc/html/libmergeant/ch12.html
|
||||
share/doc/html/libmergeant/example_bad.png
|
||||
share/doc/html/libmergeant/example_result.png
|
||||
share/doc/html/libmergeant/home.png
|
||||
share/doc/html/libmergeant/index.html
|
||||
share/doc/html/libmergeant/index.sgml
|
||||
share/doc/html/libmergeant/left.png
|
||||
share/doc/html/libmergeant/libmergeant.devhelp
|
||||
share/doc/html/libmergeant/query01.png
|
||||
share/doc/html/libmergeant/right.png
|
||||
share/doc/html/libmergeant/up.png
|
||||
share/gnome/help/mergeant/C/book1.html
|
||||
share/gnome/help/mergeant/C/c13.html
|
||||
share/gnome/help/mergeant/C/c47.html
|
||||
|
|
@ -209,6 +11,8 @@ share/gnome/help/mergeant/C/c76.html
|
|||
share/gnome/help/mergeant/C/c8.html
|
||||
share/gnome/help/mergeant/C/c84.html
|
||||
share/gnome/help/mergeant/C/c94.html
|
||||
share/gnome/help/mergeant/C/docbook.css
|
||||
share/gnome/help/mergeant/C/docbook.css
|
||||
share/gnome/help/mergeant/C/images/datasources.png
|
||||
share/gnome/help/mergeant/C/images/dba_properties.png
|
||||
share/gnome/help/mergeant/C/images/workspace-data-types.png
|
||||
|
|
@ -231,6 +35,8 @@ share/gnome/help/mergeant/C/stylesheet-images/warning.gif
|
|||
share/gnome/help/mergeant/C/topic.dat
|
||||
share/gnome/help/mergeant/C/x19.html
|
||||
share/gnome/help/mergeant/C/x40.html
|
||||
share/mime-info/mergeant.keys
|
||||
share/mime-info/mergeant.mime
|
||||
${PKGLOCALEDIR}/locale/am/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mergeant.mo
|
||||
|
|
@ -245,15 +51,27 @@ ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/mergeant.mo
|
|||
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/no/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mergeant.mo
|
||||
|
|
@ -261,14 +79,6 @@ ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mergeant.mo
|
|||
${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/mergeant.mo
|
||||
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/mergeant.mo
|
||||
share/mergeant/dtd/libmergeant.dtd
|
||||
share/mergeant/plugins/libmergeant_handler_cidr.la
|
||||
share/mergeant/plugins/libmergeant_handler_passmd5.la
|
||||
share/mergeant/plugins/libmergeant_handler_text.la
|
||||
share/mergeant/ui/mergeant.xml
|
||||
share/mime-info/mergeant.keys
|
||||
share/mime-info/mergeant.mime
|
||||
share/omf/libmergeant/libmergeant-C.omf
|
||||
share/omf/mergeant/mergeant-C.omf
|
||||
share/pixmaps/document-icons/gnome-application-x-mergeant.png
|
||||
share/pixmaps/mergeant/mergeant.png
|
||||
|
|
@ -290,19 +100,13 @@ share/pixmaps/mergeant/query-view-view_16x16.png
|
|||
@dirrm share/pixmaps/document-icons
|
||||
@comment in xdg-dirs: @dirrm share/pixmaps
|
||||
@dirrm share/omf/mergeant
|
||||
@dirrm share/omf/libmergeant
|
||||
@comment in scrollkeeper: @dirrm share/omf
|
||||
@comment in xdg-dirs: @dirrm share/mime-info
|
||||
@dirrm share/mergeant/ui
|
||||
@dirrm share/mergeant/plugins
|
||||
@dirrm share/mergeant/dtd
|
||||
@dirrm share/gnome/help/mergeant/C/stylesheet-images
|
||||
@dirrm share/gnome/help/mergeant/C/images
|
||||
@dirrm share/gnome/help/mergeant/C
|
||||
@dirrm share/doc/html/libmergeant
|
||||
@dirrm share/gnome/help/mergeant
|
||||
@comment in gnome2-dirs: @dirrm share/gnome/help
|
||||
@comment in xdg-dirs: @dirrm share/applications
|
||||
@comment in xdg-dirs: @dirrm share/application-registry
|
||||
@comment in libbonobo: @dirrm lib/bonobo/servers
|
||||
@dirrm include/libmergeant/handlers
|
||||
@dirrm include/libmergeant/graph
|
||||
@dirrm include/libmergeant
|
||||
|
|
|
|||
|
|
@ -1,12 +1,6 @@
|
|||
$NetBSD: distinfo,v 1.6 2005/04/29 22:18:30 rillig Exp $
|
||||
$NetBSD: distinfo,v 1.7 2006/02/04 17:03:30 wiz Exp $
|
||||
|
||||
SHA1 (mergeant-0.52.tar.bz2) = a762127ce6cc6faa6b4b481e97668d9ee6e53f86
|
||||
RMD160 (mergeant-0.52.tar.bz2) = eb1d887af1c390dbbe8bcad23c6b0a3f65d93f26
|
||||
Size (mergeant-0.52.tar.bz2) = 2058623 bytes
|
||||
SHA1 (patch-aa) = 9de4817eda5d142dffe23193bbeef84fb8c81e70
|
||||
SHA1 (patch-ac) = 73374c77f3cca9f1d9ecbe97a8e82ee8d12b7ef5
|
||||
SHA1 (patch-ad) = 130ca358b813e2d146784e41616e36cb5a063c68
|
||||
SHA1 (patch-ae) = 6a0eda10b0e26dd6f28e39b14b3b1ce75998ff45
|
||||
SHA1 (patch-af) = dbbe8a06d9eff06538d149f8f1ed46e59933569b
|
||||
SHA1 (patch-ag) = b82f6dee6b6964d49431289a74009417bd837576
|
||||
SHA1 (patch-ah) = f53f828a13d87c84b5fab5a4b19339cc08007316
|
||||
SHA1 (mergeant-0.62.tar.bz2) = 9ca45fcd06a21dc4e62250dc561ada97199ace42
|
||||
RMD160 (mergeant-0.62.tar.bz2) = 226fce0beb6a22f7b79abd13c199618a78390b54
|
||||
Size (mergeant-0.62.tar.bz2) = 1005279 bytes
|
||||
SHA1 (patch-aa) = 514d079fbeef0b71e9506a9a077f3739b8a97a8c
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
$NetBSD: patch-aa,v 1.2 2005/02/24 19:18:57 drochner Exp $
|
||||
$NetBSD: patch-aa,v 1.3 2006/02/04 17:03:30 wiz Exp $
|
||||
|
||||
--- frontend/main.c.orig 2005-01-18 19:55:41.000000000 +0100
|
||||
+++ frontend/main.c
|
||||
@@ -24,6 +24,9 @@
|
||||
*/
|
||||
--- src/main.c.orig 2005-05-15 17:02:21.000000000 +0000
|
||||
+++ src/main.c
|
||||
@@ -25,6 +25,9 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <libgnomedb/libgnomedb.h>
|
||||
+#ifdef HAVE_LOCALE_H
|
||||
+#include <locale.h>
|
||||
+#endif
|
||||
#include <gtk/gtk.h>
|
||||
#include "workspace-window.h"
|
||||
#include "component-factory.h"
|
||||
#include "session.h"
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
$NetBSD: patch-ac,v 1.2 2005/04/29 22:18:30 rillig Exp $
|
||||
|
||||
Needed for ISO C90 compliance.
|
||||
|
||||
--- libmergeant/mg-query.c.orig Sun Aug 8 17:20:06 2004
|
||||
+++ libmergeant/mg-query.c Tue Apr 26 13:07:06 2005
|
||||
@@ -44,7 +44,7 @@
|
||||
#include "mg-server-aggregate.h"
|
||||
#include "mg-data-handler.h"
|
||||
|
||||
-#include <libgda/sql/sql_parser.h>
|
||||
+#include <sql/sql_parser.h>
|
||||
#include "mg-qf-func.h"
|
||||
|
||||
/*
|
||||
@@ -5117,9 +5117,10 @@ parsed_create_update_query (MgQuery *que
|
||||
if (!cond)
|
||||
has_error = TRUE;
|
||||
else {
|
||||
+ MgQfield *field_left, *field_right;
|
||||
g_assert (mg_condition_get_cond_type (cond) == MG_CONDITION_LEAF_EQUAL);
|
||||
- MgQfield *field_left = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_LEFT);
|
||||
- MgQfield *field_right = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_RIGHT);
|
||||
+ field_left = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_LEFT);
|
||||
+ field_right = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_RIGHT);
|
||||
|
||||
if (IS_MG_QF_FIELD (field_left)) {
|
||||
g_object_set (G_OBJECT (field_left), "value_provider", field_right, NULL);
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-ad,v 1.1 2005/02/25 17:51:45 drochner Exp $
|
||||
|
||||
--- doc/libmergeant/C/Makefile.in.orig 2005-01-18 20:09:07.000000000 +0100
|
||||
+++ doc/libmergeant/C/Makefile.in
|
||||
@@ -214,7 +214,7 @@ AUTOMAKE_OPTIONS = 1.6
|
||||
|
||||
# The name of the module.
|
||||
DOC_MODULE = libmergeant
|
||||
-HTML_DIR = $(datadir)/gtk-doc/html
|
||||
+HTML_DIR = $(datadir)/doc/html
|
||||
|
||||
# The top-level SGML file.
|
||||
DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
$NetBSD: patch-ae,v 1.1 2005/04/29 22:18:30 rillig Exp $
|
||||
|
||||
Needed for ISO C90 compliance.
|
||||
|
||||
--- libmergeant/mg-work-grid.c.orig Sat Jul 10 15:42:54 2004
|
||||
+++ libmergeant/mg-work-grid.c Tue Apr 26 13:17:27 2005
|
||||
@@ -2299,10 +2299,11 @@ grid_modif_struct_set_status (MgWorkGrid
|
||||
GtkTreeModel *tree_model, GtkTreeIter *iter,
|
||||
MgWorkCore *core, MgDataEntryAttribute requested_status)
|
||||
{
|
||||
- g_return_if_fail (user_modif);
|
||||
guint attrs;
|
||||
GtkTreePath *path;
|
||||
gint row;
|
||||
+
|
||||
+ g_return_if_fail (user_modif);
|
||||
|
||||
switch (requested_status) {
|
||||
case MG_DATA_ENTRY_IS_NULL:
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
$NetBSD: patch-af,v 1.1 2005/04/29 22:18:30 rillig Exp $
|
||||
|
||||
Needed for ISO C90 compliance.
|
||||
|
||||
--- libmergeant/graph/mg-canvas-field.c.orig Sat Jul 10 15:42:54 2004
|
||||
+++ libmergeant/graph/mg-canvas-field.c Tue Apr 26 13:27:20 2005
|
||||
@@ -146,13 +146,13 @@ mg_canvas_field_set_property (GObject
|
||||
gpointer ptr;
|
||||
GString *string;
|
||||
MgServerDataType *dtype;
|
||||
+ MgEntity *ent;
|
||||
|
||||
cf = MG_CANVAS_FIELD (object);
|
||||
|
||||
switch (param_id) {
|
||||
case PROP_FIELD:
|
||||
ptr = g_value_get_pointer (value);
|
||||
- MgEntity *ent;
|
||||
g_return_if_fail (IS_MG_FIELD (ptr));
|
||||
|
||||
/* signals management */
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
$NetBSD: patch-ag,v 1.1 2005/04/29 22:18:30 rillig Exp $
|
||||
|
||||
Needed for ISO C90 compliance.
|
||||
|
||||
--- libmergeant/mg-form.c.orig Fri Jul 16 21:47:26 2004
|
||||
+++ libmergeant/mg-form.c Tue Apr 26 13:04:05 2005
|
||||
@@ -586,6 +586,7 @@ mark_not_null_entry_labels (MgForm *form
|
||||
{
|
||||
PangoAttrList *attrs = NULL;
|
||||
PangoAttribute *att;
|
||||
+ GSList *list;
|
||||
|
||||
if (show_mark) {
|
||||
attrs = pango_attr_list_new ();
|
||||
@@ -595,7 +596,7 @@ mark_not_null_entry_labels (MgForm *form
|
||||
pango_attr_list_insert (attrs, att);
|
||||
}
|
||||
|
||||
- GSList *list = form->priv->not_null_labels;
|
||||
+ list = form->priv->not_null_labels;
|
||||
while (list) {
|
||||
gtk_label_set_attributes (GTK_LABEL (list->data), attrs);
|
||||
list = g_slist_next (list);
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
$NetBSD: patch-ah,v 1.1 2005/04/29 22:18:30 rillig Exp $
|
||||
|
||||
Needed for ISO C90 compliance.
|
||||
|
||||
--- libmergeant/mg-parameter.c.orig Sat Jul 10 15:43:03 2004
|
||||
+++ libmergeant/mg-parameter.c Tue Apr 26 13:05:11 2005
|
||||
@@ -608,9 +608,10 @@ void
|
||||
mg_parameter_set_value (MgParameter *param, const GdaValue *value)
|
||||
{
|
||||
gboolean changed = TRUE;
|
||||
+ const GdaValue *current_val;
|
||||
+
|
||||
g_return_if_fail (param && IS_MG_PARAMETER (param));
|
||||
g_return_if_fail (param->priv);
|
||||
- const GdaValue *current_val;
|
||||
|
||||
param->priv->invalid_forced = FALSE;
|
||||
|
||||
Loading…
Reference in a new issue