diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-03-07 14:04:35 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-03-07 14:04:35 +0800 |
commit | c4d106053da4227ac0caf75791848fe3254ad884 (patch) | |
tree | f2d5369ec65017c018f783c65679f2417a1b2909 /x11-toolkits | |
parent | 6f6282c13780e8dca29fb1352bf0878b7afb34e7 (diff) | |
download | marcuscom-ports-c4d106053da4227ac0caf75791848fe3254ad884.tar marcuscom-ports-c4d106053da4227ac0caf75791848fe3254ad884.tar.gz marcuscom-ports-c4d106053da4227ac0caf75791848fe3254ad884.tar.bz2 marcuscom-ports-c4d106053da4227ac0caf75791848fe3254ad884.tar.lz marcuscom-ports-c4d106053da4227ac0caf75791848fe3254ad884.tar.xz marcuscom-ports-c4d106053da4227ac0caf75791848fe3254ad884.tar.zst marcuscom-ports-c4d106053da4227ac0caf75791848fe3254ad884.zip |
Update to 2.3.6.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1966 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/libgtk-java/Makefile | 16 | ||||
-rw-r--r-- | x11-toolkits/libgtk-java/distinfo | 4 | ||||
-rw-r--r-- | x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_TreeStore.c | 38 |
3 files changed, 48 insertions, 10 deletions
diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile index 49ff515e7..2ef3352b7 100644 --- a/x11-toolkits/libgtk-java/Makefile +++ b/x11-toolkits/libgtk-java/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libgtk-java -PORTVERSION= 2.3.5 -PORTREVISION= 1 +PORTVERSION= 2.3.6 CATEGORIES= x11-toolkits java MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.3 @@ -26,21 +25,22 @@ CONFIGURE_ARGS= --without-gcj-compile \ --with-java-prefix=${JAVA_HOME} CONFIGURE_ENV= DB2="/dev/null" -GTK_API_VERSION= 2.3 +GTK_API_VERSION= 2.4 +VERSION= beta1 PLIST_SUB= GTK_API_VERSION=${GTK_API_VERSION} \ - PORTVERSION=${PORTVERSION} + PORTVERSION=${VERSION} PKGMESSAGE= ${WRKDIR}/pkg-message do-install: ${MKDIR} ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/gtk/lib/libgtkjava${GTK_API_VERSION}.so.${PORTVERSION} \ + ${INSTALL_DATA} ${WRKSRC}/gtk/lib/libgtkjava${GTK_API_VERSION}.so.${VERSION} \ ${PREFIX}/lib - ${LN} -sf ${PREFIX}/lib/libgtkjava${GTK_API_VERSION}.so.${PORTVERSION} ${PREFIX}/lib/libgtkjava${GTK_API_VERSION}.so + ${LN} -sf ${PREFIX}/lib/libgtkjava${GTK_API_VERSION}.so.${VERSION} ${PREFIX}/lib/libgtkjava${GTK_API_VERSION}.so ${MKDIR} ${JAVAJARDIR} - ${INSTALL_DATA} ${WRKSRC}/gtk/lib/gtk${GTK_API_VERSION}-${PORTVERSION}.jar \ + ${INSTALL_DATA} ${WRKSRC}/gtk/lib/gtk${GTK_API_VERSION}-${VERSION}.jar \ ${JAVAJARDIR} - ${LN} -sf ${JAVAJARDIR}/gtk${GTK_API_VERSION}-${PORTVERSION}.jar \ + ${LN} -sf ${JAVAJARDIR}/gtk${GTK_API_VERSION}-${VERSION}.jar \ ${JAVAJARDIR}/gtk${GTK_API_VERSION}.jar post-install: diff --git a/x11-toolkits/libgtk-java/distinfo b/x11-toolkits/libgtk-java/distinfo index 7d8359aee..4b589b40d 100644 --- a/x11-toolkits/libgtk-java/distinfo +++ b/x11-toolkits/libgtk-java/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgtk-java-2.3.5.tar.bz2) = b63ea961b84b6cca0e2e19138158f48d -SIZE (gnome2/libgtk-java-2.3.5.tar.bz2) = 373294 +MD5 (gnome2/libgtk-java-2.3.6.tar.bz2) = 34267eea69bed295aeace367870363fb +SIZE (gnome2/libgtk-java-2.3.6.tar.bz2) = 378287 diff --git a/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_TreeStore.c b/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_TreeStore.c new file mode 100644 index 000000000..aaceca7c2 --- /dev/null +++ b/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_TreeStore.c @@ -0,0 +1,38 @@ +--- gtk/src/jni/org_gnu_gtk_TreeStore.c.orig Sun Mar 7 00:56:20 2004 ++++ gtk/src/jni/org_gnu_gtk_TreeStore.c Sun Mar 7 00:57:03 2004 +@@ -388,7 +388,7 @@ + *env, jclass cls, jint treeStore, jint parent, jint sibling) + { + GtkTreeStore *treeStore_g = (GtkTreeStore *)treeStore; +- GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));; ++ GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter)); + GtkTreeIter *parent_g = (GtkTreeIter *)parent; + GtkTreeIter *sibling_g = (GtkTreeIter *)sibling; + gtk_tree_store_insert_before (treeStore_g, iter_g, parent_g, sibling_g); +@@ -404,7 +404,7 @@ + jclass cls, jint treeStore, jint parent, jint sibling) + { + GtkTreeStore *treeStore_g = (GtkTreeStore *)treeStore; +- GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));; ++ GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter)); + GtkTreeIter *parent_g = (GtkTreeIter *)parent; + GtkTreeIter *sibling_g = (GtkTreeIter *)sibling; + gtk_tree_store_insert_after (treeStore_g, iter_g, parent_g, sibling_g); +@@ -420,7 +420,7 @@ + jclass cls, jint treeStore, jint parent) + { + GtkTreeStore *treeStore_g = (GtkTreeStore *)treeStore; +- GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));; ++ GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter)); + GtkTreeIter *parent_g = (GtkTreeIter *)parent; + gtk_tree_store_prepend (treeStore_g, iter_g, parent_g); + return (jint)iter_g; +@@ -435,7 +435,7 @@ + cls, jint treeStore, jint parent) + { + GtkTreeStore *treeStore_g = (GtkTreeStore *)treeStore; +- GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));; ++ GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter)); + GtkTreeIter *parent_g = (GtkTreeIter *)parent; + gtk_tree_store_append (treeStore_g, iter_g, parent_g); + return (jint)iter_g; |