[Jpackage-commits] dist/swt-gtk/devel .cvsignore, 1.1, 1.2 arch64.diff, NONE, 1.1 sources, 1.1, 1.2 swt-gtk-format.patch, NONE, 1.1 swt-gtk-jar.patch, NONE, 1.1 swt-gtk.spec, NONE, 1.1 swt-ptr-size-64.patch, NONE, 1.1

David Walluck david at ryu.zarb.org
Fri Feb 27 21:21:34 CET 2009


Update of /home/projects/jpackage/cvs/dist/swt-gtk/devel
In directory ryu.zarb.org:/tmp/cvs-serv7014/devel

Modified Files:
	.cvsignore sources 
Added Files:
	arch64.diff swt-gtk-format.patch swt-gtk-jar.patch 
	swt-gtk.spec swt-ptr-size-64.patch 
Log Message:
- initial import

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/swt-gtk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	27 Feb 2009 20:15:22 -0000	1.1
--- .cvsignore	27 Feb 2009 20:21:32 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ swt-gtk_3.4-2ubuntu3.diff.gz
+ swt-gtk_3.4.orig.tar.gz

--- NEW FILE: swt-gtk-format.patch ---
--- os.c.orig	2009-02-27 13:49:23.232146862 -0500
+++ os.c	2009-02-27 14:00:28.086147248 -0500
@@ -9511,7 +9511,7 @@
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1message_1dialog_1new_FUNC);
 	if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jlong)gtk_message_dialog_new((GtkWindow *)arg0, (GtkDialogFlags)arg1, (GtkMessageType)arg2, (GtkButtonsType)arg3, (const gchar *)lparg4);
+	rc = (jlong)gtk_message_dialog_new((GtkWindow *)arg0, (GtkDialogFlags)arg1, (GtkMessageType)arg2, (GtkButtonsType)arg3, "%s", (const gchar *)lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1message_1dialog_1new_FUNC);

--- NEW FILE: swt-gtk.spec ---
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
%define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
%define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}

%bcond_without          gcj_support
%define section         free
%if %with gcj_support
%define gcj_support     1
%else
%define gcj_support     1
%endif

Name:           swt-gtk
Version:        3.4
Release:        1%{?dist}
Epoch:          0
Summary:        Standard Widget Toolkit for GTK+
License:        CPL 1.0
Group:          Development/Libraries/Java
URL:            http://download.eclipse.org/eclipse/downloads/
Source0:        swt-gtk_3.4.orig.tar.gz
Patch0:         swt-gtk_3.4-2ubuntu3.diff.gz
Patch1:         arch64.diff
Patch2:         swt-ptr-size-64.patch
Patch3:         swt-gtk-jar.patch
Patch4:         swt-gtk-format.patch
BuildRequires:  java-devel
BuildRequires:  jpackage-utils
BuildRequires:  pkgconfig(cairo)
BuildRequires:  pkgconfig(gnome-vfs-module-2.0)
BuildRequires:  pkgconfig(gl)
BuildRequires:  pkgconfig(glu)
BuildRequires:  pkgconfig(libgnome-2.0)
BuildRequires:  pkgconfig(libgnomeui-2.0)
BuildRequires:  xulrunner-devel
%if %{gcj_support}
BuildRequires:  java-gcj-compat-devel
%endif
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

%description
The SWT component is designed to provide efficient, portable
access to the user-interface facilities of the operating systems
on which it is implemented.

%package javadoc
Group:          Development/Documentation
Summary:        Javadoc for %{name}

%description javadoc
Javadoc for %{name}.

%prep
%setup -q -n %{name}-%{version}.orig
%patch0 -p1
%ifarch x86_64
%patch1 -p1
%patch2 -p0
%endif
%patch3 -p0
%patch4 -p0

%{__mv} about_files/pixman-licenses.txt about_files/pixman-licenses.txt.orig
%{_bindir}/iconv -f iso-8859-1 -t utf8 -o about_files/pixman-licenses.txt about_files/pixman-licenses.txt.orig
%{__rm} about_files/pixman-licenses.txt.orig

%build
export MODEL="`/bin/uname -m`"
export JAVA_HOME="%{java_home}"
%{make} JAVAC="%{javac}" JAR="%{jar}" RM="%{__rm}" CC="%{__cc}" CXX="%{__cxx}" CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
%{javadoc} -d `pwd`/api `%{_bindir}/find -type f -name "*.java"`

%install
%{__rm} -rf %{buildroot}

# jar
%{__mkdir_p} %{buildroot}%{_jnidir}
%{__cp} -p swt-gtk-%{version}.jar %{buildroot}%{_jnidir}/%{name}-%{version}.jar
(cd %{buildroot}%{_jnidir} && for jar in *-%{version}*; do %{__ln_s} ${jar} `/bin/echo ${jar} | %{__sed}  "s|-%{version}||g"`; done)

# javadoc
%{__mkdir_p} 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
%{__cp} -a api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}

%{__mkdir_p} %{buildroot}%{_libdir}/%{name}
%{__cp} -p *.so %{buildroot}%{_libdir}/%{name}/

%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif

%clean
%{__rm} -rf %{buildroot}

%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%if %{gcj_support}
%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(0644,root,root,0755)
%doc about.html about_files/
%{_jnidir}/%{name}.jar
%{_jnidir}/%{name}-%{version}.jar
%{_libdir}/%{name}
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/*
%endif

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Fri Feb 27 2009 David Walluck <dwalluck at redhat.com> 0:3.4-1
- release

--- NEW FILE: swt-gtk-jar.patch ---
--- Makefile.orig	2009-02-27 13:48:22.159342833 -0500
+++ Makefile	2009-02-27 13:48:45.483427465 -0500
@@ -33,4 +33,4 @@
 	touch $@
 
 %.jar: %-stamp
-	$(JAR) -C $* -cf $@ .
+	$(JAR) -cf $@ -C $* .

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/swt-gtk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	27 Feb 2009 20:15:22 -0000	1.1
--- sources	27 Feb 2009 20:21:32 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ 4d3fa9c9a01fc7d071fcfb753d42d190  swt-gtk_3.4-2ubuntu3.diff.gz
+ 3c03c9ef2453e71d3158d3f3260eaf49  swt-gtk_3.4.orig.tar.gz

--- NEW FILE: arch64.diff ---
diff -ur x86/atk.c x86_64/atk.c
--- x86/atk.c	2007-03-19 17:30:14.000000000 -0700
+++ x86_64/atk.c	2008-06-17 21:05:52.000000000 -0700
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved.
  * The contents of this file are made available under the terms
  * of the GNU Lesser General Public License (LGPL) Version 2.1 that
  * accompanies this distribution (lgpl-v21.txt).  The LGPL is also
@@ -44,72 +44,72 @@
 #endif
 
 #ifndef NO__1ATK_1ACTION_1GET_1IFACE
-JNIEXPORT jint JNICALL ATK_NATIVE(_1ATK_1ACTION_1GET_1IFACE)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1ACTION_1GET_1IFACE)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
[...68341 lines suppressed...]
diff -ur x86/xpcom_structs.cpp x86_64/xpcom_structs.cpp
--- x86/xpcom_structs.cpp	2007-01-29 15:47:46.000000000 -0800
+++ x86_64/xpcom_structs.cpp	2008-06-17 21:05:54.000000000 -0700
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff -ur x86/xpcom_structs.h x86_64/xpcom_structs.h
--- x86/xpcom_structs.h	2007-01-29 15:47:46.000000000 -0800
+++ x86_64/xpcom_structs.h	2008-06-17 21:05:54.000000000 -0700
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

--- NEW FILE: swt-ptr-size-64.patch ---
--- make_linux.mak.orig	2007-10-13 11:07:08.000000000 -0700
+++ make_linux.mak	2007-10-13 11:15:01.000000000 -0700
@@ -1,3 +1,4 @@
+SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
 #*******************************************************************************
 # Copyright (c) 2000, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials




More information about the JPackage-commits mailing list