rpms/gambas/devel gambas-1.0.6-dont-make-links.patch, NONE, 1.1 gambas-1.0.6-gcc4.patch, NONE, 1.1 gambas-1.0.6-noopt.patch, NONE, 1.1 gambas.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Mon Jun 13 16:43:07 UTC 2005
Author: spot
Update of /cvs/extras/rpms/gambas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8765/devel
Modified Files:
.cvsignore sources
Added Files:
gambas-1.0.6-dont-make-links.patch gambas-1.0.6-gcc4.patch
gambas-1.0.6-noopt.patch gambas.spec
Log Message:
auto-import gambas-1.0.6-1 on branch devel from gambas-1.0.6-1.src.rpm
gambas-1.0.6-dont-make-links.patch:
--- NEW FILE gambas-1.0.6-dont-make-links.patch ---
--- gambas-1.0.6/Makefile.am.BAD 2005-05-23 21:42:27.000000000 -0500
+++ gambas-1.0.6/Makefile.am 2005-05-23 21:43:08.000000000 -0500
@@ -14,17 +14,17 @@
ROOT=$DESTDIR; \
fi
- @if test "$(DESTDIR)$(bindir)" != "$(ROOT)/usr/bin" && test "$(DESTDIR)$(bindir)" != "$(ROOT)/usr/bin/"; then \
- echo "Making symbolic links in /usr/bin..."; \
- rm -f $(ROOT)/usr/bin/gbx; \
- ln -s $(DESTDIR)$(bindir)/gbx $(ROOT)/usr/bin/gbx; \
- rm -f $(ROOT)/usr/bin/gbc; \
- ln -s $(DESTDIR)$(bindir)/gbc $(ROOT)/usr/bin/gbc; \
- rm -f $(ROOT)/usr/bin/gba; \
- ln -s $(DESTDIR)$(bindir)/gba $(ROOT)/usr/bin/gba; \
- rm -f $(ROOT)/usr/bin/gbi; \
- ln -s $(DESTDIR)$(bindir)/gbi $(ROOT)/usr/bin/gbi; \
- fi
+# @if test "$(DESTDIR)$(bindir)" != "$(ROOT)/usr/bin" && test "$(DESTDIR)$(bindir)" != "$(ROOT)/usr/bin/"; then \
+# echo "Making symbolic links in /usr/bin..."; \
+# rm -f $(ROOT)/usr/bin/gbx; \
+# ln -s $(DESTDIR)$(bindir)/gbx $(ROOT)/usr/bin/gbx; \
+# rm -f $(ROOT)/usr/bin/gbc; \
+# ln -s $(DESTDIR)$(bindir)/gbc $(ROOT)/usr/bin/gbc; \
+# rm -f $(ROOT)/usr/bin/gba; \
+# ln -s $(DESTDIR)$(bindir)/gba $(ROOT)/usr/bin/gba; \
+# rm -f $(ROOT)/usr/bin/gbi; \
+# ln -s $(DESTDIR)$(bindir)/gbi $(ROOT)/usr/bin/gbi; \
+# fi
@echo
@echo "Creating the library info files..."
@@ -38,10 +38,10 @@
@echo "Installing the development environment..."
@(cd $(srcdir)/app; d=`pwd`; for p in *; do echo "Compiling $$p..."; cd $$d/$$p; \
$(DESTDIR)$(bindir)/gbc -ag; $(DESTDIR)$(bindir)/gba; rm -rf .gambas; $(INSTALL) $$p $(DESTDIR)$(bindir); done)
- @if test "$(bindir)" != "$(ROOT)/usr/bin" && test "$(bindir)" != "$(ROOT)/usr/bin/"; then \
- rm -f $(ROOT)/usr/bin/gambas; \
- ln -s $(DESTDIR)$(bindir)/gambas $(ROOT)/usr/bin/gambas; \
- fi
+# @if test "$(bindir)" != "$(ROOT)/usr/bin" && test "$(bindir)" != "$(ROOT)/usr/bin/"; then \
+# rm -f $(ROOT)/usr/bin/gambas; \
+# ln -s $(DESTDIR)$(bindir)/gambas $(ROOT)/usr/bin/gambas; \
+# fi
@echo
@echo "Installing the gambas help files..."
gambas-1.0.6-gcc4.patch:
--- NEW FILE gambas-1.0.6-gcc4.patch ---
--- gambas-1.0.6/src/lib/net/curl/CFtpClient.c.BAD 2005-06-02 01:08:05.000000000 -0500
+++ gambas-1.0.6/src/lib/net/curl/CFtpClient.c 2005-06-02 01:09:04.000000000 -0500
@@ -57,7 +57,7 @@
{
/* BM */
FILE *file = THIS_FILE;
- THIS_STATUS=4;
+ THIS_STATUS_NOCAST=4;
if (!feof(file))
nmemb=fread(buffer,size,nmemb,file);
@@ -70,7 +70,7 @@
int ftp_write_curl(void *buffer, size_t size, size_t nmemb, void *_object)
{
- THIS_STATUS=4;
+ THIS_STATUS_NOCAST=4;
if (THIS_FILE)
{
@@ -111,12 +111,12 @@
{
CCURL_stop(_object);
ftp_reset(_object);
- THIS_CURL=curl_easy_init();
+ THIS_CURL_NOCAST=curl_easy_init();
}
}
else
{
- THIS_CURL=curl_easy_init();
+ THIS_CURL_NOCAST=curl_easy_init();
}
curl_easy_setopt(THIS_CURL, CURLOPT_VERBOSE,1);
@@ -127,7 +127,7 @@
curl_easy_setopt(THIS_CURL, CURLOPT_URL,THIS_URL);
ftp_reset(THIS);
- THIS_STATUS=6;
+ THIS_STATUS_NOCAST=6;
THIS->stream.desc=&CurlStream;
}
@@ -177,7 +177,7 @@
GB.Error("Still active");
return;
}
- THIS_FILE=fopen(STRING(TargetHost),"w");
+ THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w");
if (!THIS_FILE)
{
GB.Error("Unable to open file for writing");
@@ -209,7 +209,7 @@
return;
}
- THIS_FILE=fopen(STRING(SourceFile),"r");
+ THIS_FILE_NOCAST=fopen(STRING(SourceFile),"r");
if (!THIS_FILE)
{
GB.Error("Unable to open file for reading");
@@ -234,12 +234,12 @@
char *tmp=NULL;
GB.Alloc((void**)&tmp,sizeof(char)*(1+strlen("ftp://127.0.0.1:21")));
- THIS_URL=tmp;
+ THIS_URL_NOCAST=tmp;
strcpy(tmp,"ftp://127.0.0.1:21");
tmp=NULL;
GB.Alloc((void**)&tmp,7);
strcpy(tmp,"ftp://");
- THIS_PROTOCOL=tmp;
+ THIS_PROTOCOL_NOCAST=tmp;
Adv_user_SETAUTH (&THIS->user,CURLAUTH_BASIC);
--- gambas-1.0.6/src/lib/net/curl/CCurl.h.BAD 2005-06-02 00:30:42.000000000 -0500
+++ gambas-1.0.6/src/lib/net/curl/CCurl.h 2005-06-02 00:56:02.000000000 -0500
@@ -45,6 +45,12 @@
#define THIS_FILE ((char*)(((CCURL *)_object)->stream._free[3]))
#define THIS_PROTOCOL ((char*)(((CCURL *)_object)->stream._free[4]))
+#define THIS_STATUS_NOCAST (((CCURL *)_object)->stream._free[0])
+#define THIS_CURL_NOCAST (((CCURL *)_object)->stream._free[1])
+#define THIS_URL_NOCAST (((CCURL *)_object)->stream._free[2])
+#define THIS_FILE_NOCAST (((CCURL *)_object)->stream._free[3])
+#define THIS_PROTOCOL_NOCAST (((CCURL *)_object)->stream._free[4])
+
#endif
typedef struct
--- gambas-1.0.6/src/lib/net/curl/CHttpClient.h.BAD 2005-06-02 01:00:01.000000000 -0500
+++ gambas-1.0.6/src/lib/net/curl/CHttpClient.h 2005-06-02 01:01:14.000000000 -0500
@@ -45,6 +45,12 @@
#define THIS_FILE ((char*)(((CHTTPCLIENT *)_object)->stream._free[3]))
#define THIS_PROTOCOL ((char*)(((CHTTPCLIENT *)_object)->stream._free[4]))
+#define THIS_STATUS_NOCAST (((CHTTPCLIENT *)_object)->stream._free[0])
+#define THIS_CURL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[1])
+#define THIS_URL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[2])
+#define THIS_FILE_NOCAST (((CHTTPCLIENT *)_object)->stream._free[3])
+#define THIS_PROTOCOL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[4])
+
#endif
typedef struct
--- gambas-1.0.6/src/lib/net/curl/CHttpClient.c.BAD 2005-06-02 01:01:18.000000000 -0500
+++ gambas-1.0.6/src/lib/net/curl/CHttpClient.c 2005-06-02 01:04:08.000000000 -0500
@@ -133,7 +133,7 @@
if (THIS_STATUS==6)
{
- THIS_STATUS=4;
+ THIS_STATUS_NOCAST=4;
GB.Ref(THIS);
GB.Post(CCURL_raise_connect,(long)THIS);
}
@@ -335,14 +335,14 @@
GB.Alloc((void**)&tmp,sizeof(char)*(1+strlen("http://127.0.0.1:80")));
strcpy(tmp,"http://127.0.0.1:80");
- THIS_URL=tmp;
+ THIS_URL_NOCAST=tmp;
GB.NewString(&THIS->sUserAgent,"Gambas Http/1.0",0);
tmp=NULL;
GB.Alloc((void**)&tmp,8);
strcpy(tmp,"http://");
- THIS_PROTOCOL=tmp;
+ THIS_PROTOCOL_NOCAST=tmp;
END_METHOD
@@ -378,12 +378,12 @@
{
CCURL_stop(_object);
http_reset(_object);
- THIS_CURL=curl_easy_init();
+ THIS_CURL_NOCAST=curl_easy_init();
}
}
else
{
- THIS_CURL=curl_easy_init();
+ THIS_CURL_NOCAST=curl_easy_init();
}
@@ -410,7 +410,7 @@
THIS->ReturnString=NULL;
}
http_reset(_object);
- THIS_STATUS=6;
+ THIS_STATUS_NOCAST=6;
THIS->stream.desc=&CurlStream;
}
@@ -437,7 +437,7 @@
GB.Error("Still active");
return;
}
- THIS_FILE=fopen(STRING(TargetHost),"w");
+ THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w");
if (!THIS_FILE)
{
GB.Error("Unable to open file for writing");
@@ -500,7 +500,7 @@
GB.Error("Still active");
return;
}
- THIS_FILE=fopen(STRING(TargetHost),"w");
+ THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w");
if (!THIS_FILE)
{
GB.Error("Unable to open file for writing");
--- gambas-1.0.6/src/lib/net/curl/CCurl.c.BAD 2005-06-02 00:29:54.000000000 -0500
+++ gambas-1.0.6/src/lib/net/curl/CCurl.c 2005-06-02 00:57:36.000000000 -0500
@@ -170,20 +170,20 @@
if (THIS_FILE)
{
fclose(THIS_FILE);
- THIS_FILE=NULL;
+ THIS_FILE_NOCAST=NULL;
}
switch ( ErrCode )
{
case CURLE_OK:
curl_multi_remove_handle(CCURL_multicurl,THIS_CURL);
- THIS_STATUS=0;
+ THIS_STATUS_NOCAST=NULL;
GB.Ref(THIS);
GB.Post(CCURL_raise_finished,(long)THIS);
break;
default:
curl_multi_remove_handle(CCURL_multicurl,THIS_CURL);
- THIS_STATUS=-1*(1000+ErrCode);
+ THIS_STATUS_NOCAST=(int)(-1*(1000+ErrCode));
GB.Ref(THIS);
GB.Post(CCURL_raise_error,(long)THIS);
break;
@@ -200,16 +200,16 @@
if (THIS_FILE)
{
fclose(THIS_FILE);
- THIS_FILE=NULL;
+ THIS_FILE_NOCAST=NULL;
}
if (THIS_CURL)
{
curl_multi_remove_handle(CCURL_multicurl,THIS_CURL);
curl_easy_cleanup(THIS_CURL);
- THIS_CURL=NULL;
+ THIS_CURL_NOCAST=NULL;
}
- THIS_STATUS=0;
+ THIS_STATUS_NOCAST=0;
}
void CCURL_init_post(void)
@@ -362,7 +362,7 @@
GB.Alloc((void**)&tmp,(strlen(GB.ToZeroString(PROP(GB_STRING)))+1)*sizeof(char));
strcpy(tmp,GB.ToZeroString(PROP(GB_STRING)));
Adv_correct_url(&tmp,THIS_PROTOCOL);
- THIS_URL=tmp;
+ THIS_URL_NOCAST=tmp;
END_PROPERTY
@@ -380,9 +380,9 @@
BEGIN_METHOD_VOID(CCURL_new)
THIS->stream.desc=NULL;
- THIS_CURL=NULL;
- THIS_URL=NULL;
- THIS_FILE=NULL;
+ THIS_CURL_NOCAST=NULL;
+ THIS_URL_NOCAST=NULL;
+ THIS_FILE_NOCAST=NULL;
GB.StoreVariant(NULL, (void *)&THIS->tag);
Adv_user_NEW (&THIS->user);
GB.New ((void**)&THIS->proxy,GB.FindClass(".Proxy"),NULL,NULL);
--- gambas-1.0.6/src/lib/net/curl/CFtpClient.h.BAD 2005-06-02 01:06:02.000000000 -0500
+++ gambas-1.0.6/src/lib/net/curl/CFtpClient.h 2005-06-02 01:06:43.000000000 -0500
@@ -45,6 +45,12 @@
#define THIS_FILE ((char*)(((CFTPCLIENT *)_object)->stream._free[3]))
#define THIS_PROTOCOL ((char*)(((CFTPCLIENT *)_object)->stream._free[4]))
+#define THIS_STATUS_NOCAST (((CFTPCLIENT *)_object)->stream._free[0])
+#define THIS_CURL_NOCAST (((CFTPCLIENT *)_object)->stream._free[1])
+#define THIS_URL_NOCAST (((CFTPCLIENT *)_object)->stream._free[2])
+#define THIS_FILE_NOCAST (((CFTPCLIENT *)_object)->stream._free[3])
+#define THIS_PROTOCOL_NOCAST (((CFTPCLIENT *)_object)->stream._free[4])
+
#endif
typedef struct
--- gambas-1.0.6/src/exec/gbx_c_process.c.BAD 2005-06-02 00:20:39.000000000 -0500
+++ gambas-1.0.6/src/exec/gbx_c_process.c 2005-06-02 00:21:43.000000000 -0500
@@ -173,7 +173,8 @@
GB_Detach(THIS);
/*printf("** stop_process_after\n");*/
- GB_Unref((void **)&THIS); /* Ref du post */
+ void **my_object = (void **)THIS;
+ GB_Unref(&my_object); /* Ref du post */
}
--- gambas-1.0.6/src/exec/gbx_class_load.c.BAD 2005-06-02 00:13:34.000000000 -0500
+++ gambas-1.0.6/src/exec/gbx_class_load.c 2005-06-02 00:13:45.000000000 -0500
@@ -85,7 +85,7 @@
PRIVATE int NSection;
#endif
-#define RELOCATE(_ptr) ((char *)(_ptr) = (char *)&class->string[(long)(_ptr)])
+#define RELOCATE(_ptr) ((_ptr) = (char *)&class->string[(long)(_ptr)])
PRIVATE char *get_section(char *sec_name, char **section, long one, short *psize, char *swapcode)
gambas-1.0.6-noopt.patch:
--- NEW FILE gambas-1.0.6-noopt.patch ---
--- gambas-1.0.6/configure.in.BAD 2005-06-02 16:16:29.000000000 -0500
+++ gambas-1.0.6/configure.in 2005-06-02 16:16:56.000000000 -0500
@@ -354,26 +354,26 @@
fi
-if test "$gambas_debug" = "yes"; then
- CFLAGS="$CFLAGS -g"
- CXXFLAGS="$CXXFLAGS -g"
-fi
+# if test "$gambas_debug" = "yes"; then
+# CFLAGS="$CFLAGS -g"
+# CXXFLAGS="$CXXFLAGS -g"
+#fi
# gambas_flag="-O2 -fstrength-reduce -frerun-loop-opt -fexpensive-optimizations -fschedule-insns2 -funroll-loops"
# gambas_flags="$gambas_flags -fno-strict-aliasing -falign-loops=2 -falign-jumps=2"
# gambas_flags="$gambas_flags -falign-functions=2 -ffast-math"
-if test "$gambas_prof" = "no"; then
- gambas_flags="$gambas_flags -fomit-frame-pointer"
-fi
-
-if test "x$gambas_optimization" = "xyes"; then
- CFLAGS="$CFLAGS -Os"
- CXXFLAGS="$CXXFLAGS -Os -fno-omit-frame-pointer"
-else
- CFLAGS="$CFLAGS -O0"
- CXXFLAGS="$CXXFLAGS -O0"
-fi
+# if test "$gambas_prof" = "no"; then
+# gambas_flags="$gambas_flags -fomit-frame-pointer"
+# fi
+
+# if test "x$gambas_optimization" = "xyes"; then
+# CFLAGS="$CFLAGS -Os"
+# CXXFLAGS="$CXXFLAGS -Os -fno-omit-frame-pointer"
+# else
+# CFLAGS="$CFLAGS -O0"
+# CXXFLAGS="$CXXFLAGS -O0"
+# fi
dnl ---- Create makefiles
--- NEW FILE gambas.spec ---
Name: gambas
Summary: IDE based on a basic interpreter with object extensions
Version: 1.0.6
Release: 1%{?dist}
License: GPL
Group: Development/Tools
URL: http://gambas.sourceforge.net/
Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdelibs-devel, libjpeg-devel, automake, autoconf
BuildRequires: qt-devel, SDL-devel, mysql-devel, postgresql-devel, XFree86-devel
BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel
Patch0: gambas-1.0.6-gcc4.patch
Patch1: gambas-1.0.6-dont-make-links.patch
Patch2: gambas-1.0.6-noopt.patch
%description
Gambas is a free development environment based on a Basic interpreter
with object extensions, like Visual Basic¢(but it is NOT a clone !)..
With Gambas, you can quickly design your program GUI, access MySQL or
PostgreSQL databases, pilot KDE applications with DCOP, translate your
program into many languages, create network applications easily, and so
on...
%package devel
Summary: Development libraries and headers for gambas
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
The gambas-devel package contains the development libraries and
headers for gambas.
%package help
Summary: Help files for gambas
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description help
The gambas-help package contains all the help files for gambas.
%package examples
Summary: Examples for gambas
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description examples
The gambas-examples package contains some examples for gambas.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
# Gambas can't deal with -Wp,-D_FORTIFY_SOURCE=2
CFLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g'`
rm -f $(find . -type f | egrep "Makefile$") $(find . -type f | egrep "Makefile.in$")
./reconf || echo reconf gives a warning but lets continue anyway
%configure \
--datadir="%{_datadir}" \
--enable-intl \
--enable-conv \
--enable-qt \
--enable-kde \
--enable-net \
--enable-curl \
--enable-postgresql \
--enable-mysql \
--enable-sqlite \
--enable-sdl \
--enable-vb
%{__make} %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
export PATH=$RPM_BUILD_ROOT/usr/bin:$PATH
make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT/%{_libdir}/gambas/*.la
install src/share/gambas.h $RPM_BUILD_ROOT/%{_includedir}
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-, root, root, 0755)
%doc README AUTHORS COPYING INSTALL README README.REDHAT TODO
%dir %{_libdir}/gambas
%{_libdir}/gambas/*.so.*
%{_libdir}/gambas/lib.gb*.component
%{_bindir}/gambas
%{_bindir}/gbc
%{_bindir}/gba
%{_bindir}/gbi
%{_bindir}/gbx
%{_bindir}/gambas-database-manager
# Normally, this file should be in the -devel package
# However, gambas can't run without the .so. :P
%{_libdir}/gambas/*.so
%files devel
%defattr(-, root, root, 0755)
%{_includedir}/gambas.h
%dir %{_datadir}/gambas/
%{_datadir}/gambas/info
%files help
%defattr(-,root,root,0755)
%dir %{_datadir}/gambas/
%{_datadir}/gambas/help
%files examples
%defattr(-,root,root,0755)
%dir %{_datadir}/gambas/
%{_datadir}/gambas/examples
%changelog
* Mon May 23 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.6-1
- initial package for Fedora Extras (based on package by Dries Verachtert)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gambas/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Jun 2005 16:40:48 -0000 1.1
+++ .cvsignore 13 Jun 2005 16:43:05 -0000 1.2
@@ -0,0 +1 @@
+gambas-1.0.6.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gambas/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Jun 2005 16:40:48 -0000 1.1
+++ sources 13 Jun 2005 16:43:05 -0000 1.2
@@ -0,0 +1 @@
+608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2
More information about the fedora-extras-commits
mailing list