Merge branch 'master' of git://repo.or.cz/xbps/ojab

--HG--
extra : convert_revision : 24722f6a1f9ed8c477b4aa937caafe275d08bf80
This commit is contained in:
Juan RP 2009-12-28 16:44:38 +01:00
commit 5784b6f7b2
6 changed files with 146 additions and 0 deletions

View File

@ -0,0 +1,42 @@
--- src/background.C.orig 2009-04-25 01:12:46.000000000 +0200
+++ src/background.C 2009-04-25 01:19:21.000000000 +0200
@@ -261,7 +261,7 @@
unsigned int w = 0, h = 0;
unsigned int n;
unsigned long new_flags = (flags & (~geometryFlags));
- char *p;
+ const char *p;
# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
if (geom == NULL)
@@ -677,7 +677,7 @@
if (!target->asimman)
target->asimman = create_generic_imageman (target->rs[Rs_path]);
- if (char *f = strchr (file, ';'))
+ if (char *f = (char *) strchr (file, ';'))
{
size_t len = f - file;
f = (char *)malloc (len + 1);
--- src/command.C.orig 2009-04-25 01:20:29.000000000 +0200
+++ src/command.C 2009-04-25 01:21:20.000000000 +0200
@@ -3336,7 +3336,7 @@
}
else
{
- char *eq = strchr (str, '='); // constness lost, but verified to be ok
+ char *eq = (char *) strchr (str, '='); // constness lost, but verified to be ok
if (eq)
{
--- src/misc.C.orig 2009-04-25 01:41:05.000000000 +0200
+++ src/misc.C 2009-04-25 01:41:37.000000000 +0200
@@ -170,7 +170,7 @@
char *
rxvt_basename (const char *str) NOTHROW
{
- char *base = strrchr (str, '/');
+ char *base = (char *) strrchr (str, '/');
return (char *) (base ? base + 1 : str);
}

View File

@ -0,0 +1,21 @@
# Template build file for 'rxvt-unicode'.
pkgname=rxvt-unicode
version=9.06
distfiles="http://dist.schmorp.de/${pkgname}/${pkgname}-${version}.tar.bz2"
build_style=gnu_configure
configure_args="--enable-everything"
short_desc="rxvt clone supporting Xft fonts and Unicode"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=8ef9359c01059efd330626c6cd7b082be9bf10587f2b9fe84caa43a84aa576d1
long_desc="
rxvt-unicode is a clone of the well known terminal emulator rxvt,
modified to store text in Unicode (either UCS-2 or UCS-4) and to use
locale-correct input and output. It also supports mixing multiple
fonts at the same time, including Xft fonts."
Add_dependency full libXpm
Add_dependency full libXft
Add_dependency full perl
Add_dependency build pkg-config
Add_dependency build renderproto

View File

@ -0,0 +1,21 @@
# Template build file for 'rxvt-unicode'.
pkgname=rxvt-unicode
version=9.06
distfiles="http://dist.schmorp.de/${pkgname}/${pkgname}-${version}.tar.bz2"
build_style=gnu_configure
configure_args="--enable-everything"
short_desc="rxvt clone supporting Xft fonts and Unicode"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=69b903b6305211c9fc5db394f3d08c0a696aa51942d73db7f594422e7be6edf0
long_desc="
rxvt-unicode is a clone of the well known terminal emulator rxvt,
modified to store text in Unicode (either UCS-2 or UCS-4) and to use
locale-correct input and output. It also supports mixing multiple
fonts at the same time, including Xft fonts."
Add_dependency full libXpm
Add_dependency full libXft
Add_dependency full perl
Add_dependency build pkg-config
Add_dependency build renderproto

View File

@ -0,0 +1,10 @@
[Desktop Entry]
Encoding=UTF-8
Name=Thunderbird
Comment=Mail & News Reader
Exec=thunderbird
Icon=thunderbird.png
Terminal=false
Type=Application
Categories=Application;Network;
StartupNotify=true

View File

@ -0,0 +1,14 @@
--- mail/installer/Makefile.in 2009-12-01 06:47:04.000000000 +0300
+++ ../comm-1.9.1-shared/mail/installer/Makefile.in 2009-12-22 16:09:43.000000000 +0300
@@ -95,9 +95,11 @@
# mozconfig instead.
ifndef MAIL_PKG_SHARED
ifndef BUILD_STATIC_LIBS
+ifeq (BUILD_STATIC_LIBS, 1)
$(error you need an "--enable-static" build to package a build)
endif
endif
+endif
# On mozilla-central, packager.mk uses core_abspath to redefine DIST
# As the comm-central config.mk doesn't set it, do it ourselves instead

View File

@ -0,0 +1,38 @@
# Template build file for 'thunderbird'.
pkgname=thunderbird
version=3.0rc2
wrksrc=comm-1.9.1
distfiles="ftp://ftp.mozilla.org/pub/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
build_style=gnu_configure
configure_args="--enable-application=mail --enable-default-toolkit=cairo-gtk2
--disable-dbus --disable-crashreporter --disable-tests --disable-debug
--enable-optimize --disable-embedding-tests --disable-installer --disable-javaxpcom
--disable-embedding-tests --disable-necko-wifi --disable-libnotify --with-system-jpeg
--with-system-zlib --with-system-bz2 --enable-system-cairo --with-system-sqlite
--with-system-png --with-system-nspr --with-system-nss"
# --enable-libxul --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.1"
short_desc="Mozilla mail client"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=2c18b692e2eb5bbb4a6207a249a7a478463f333bae50c3648568104eb3368481
long_desc="
Mozilla Thunderbird is a redesign of the Mozilla mail component. The
goal is to produce a cross platform stand alone mail application using
the XUL user interface language. This version uses the gtk2 toolkit."
Add_dependency run libstdc++
Add_dependency run gtk+
Add_dependency run xulrunner
Add_dependency build zip
Add_dependency build python
Add_dependency build gtk+-devel
Add_dependency build xulrunner-devel
post_install()
{
install -d ${DESTDIR}/usr/share/applications || return 1
install -d ${DESTDIR}/usr/share/pixmaps || return 1
install -m644 ${FILESDIR}/*.desktop \
${DESTDIR}/usr/share/applications || return 1
install -m644 ${wrksrc}/mail/branding/nightly/mailicon48.png \
${DESTDIR}/usr/share/pixmaps/thunderbird.png || return 1
}