mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 10:37:22 -08:00
Merge updates from master
This commit is contained in:
@@ -129,10 +129,10 @@ php-ext-source-r2_src_prepare() {
|
||||
# Runs phpize and autotools in addition to the standard src_unpack
|
||||
php-ext-source-r2_phpize() {
|
||||
if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then
|
||||
# Create configure out of config.m4
|
||||
# I wish I could run this to solve #329071, but I cannot
|
||||
#autotools_run_tool ${PHPIZE}
|
||||
${PHPIZE}
|
||||
# Create configure out of config.m4. We use autotools_run_tool
|
||||
# to avoid some warnings about WANT_AUTOCONF and
|
||||
# WANT_AUTOMAKE (see bugs #329071 and #549268).
|
||||
autotools_run_tool ${PHPIZE}
|
||||
# force run of libtoolize and regeneration of related autotools
|
||||
# files (bug 220519)
|
||||
rm aclocal.m4
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
--- configure.ac.orig 2007-10-13 23:54:47.000000000 +0200
|
||||
+++ configure.ac 2015-09-02 21:10:40.829519545 +0200
|
||||
@@ -26,15 +26,15 @@
|
||||
dnl look for X windows first so further libs check
|
||||
AC_PATH_X
|
||||
|
||||
-if test "$x_includes" != "NONE"; then
|
||||
+if test "$x_includes" != "NONE" && test -n "$x_includes"; then
|
||||
CFLAGS="$CFLAGS -I$x_includes"
|
||||
fi
|
||||
-if test "$x_libraries" != "NONE"; then
|
||||
+if test "$x_libraries" != "NONE" && test -n "$x_libraries"; then
|
||||
LDFLAGS="$LDFLAGS -L$x_libraries"
|
||||
fi
|
||||
|
||||
dnl Additional "default" items
|
||||
-#LIBS="$LIBS -lX11"
|
||||
+LIBS="$LIBS -lm -lX11 -lXpm"
|
||||
#CFLAGS="$CFLAGS -I/usr/X11/include"
|
||||
#LDFLAGS="$LDFLAGS -L/usr/X11/lib"
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
diff -Naur fsviewer-app-0.2.6.orig/src/FSFileView.c fsviewer-app-0.2.6/src/FSFileView.c
|
||||
--- fsviewer-app-0.2.6.orig/src/FSFileView.c 2007-10-14 21:06:02.000000000 +0200
|
||||
+++ fsviewer-app-0.2.6/src/FSFileView.c 2015-09-02 21:18:39.574691303 +0200
|
||||
@@ -430,7 +430,7 @@
|
||||
WMResizableWindowMask);
|
||||
attributes.window_level = WMNormalWindowLevel;
|
||||
attributes.extra_flags = GSFullKeyboardEventsFlag;
|
||||
- attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr |
|
||||
+ attributes.flags = (/*GSWindowStyleAttr |*/ GSWindowLevelAttr |
|
||||
GSExtraFlagsAttr);
|
||||
WMSetWindowAttributes(fView->dpy, WMWidgetXID(fView->fileView),
|
||||
&attributes);
|
||||
diff -Naur fsviewer-app-0.2.6.orig/src/FSFinder.c fsviewer-app-0.2.6/src/FSFinder.c
|
||||
--- fsviewer-app-0.2.6.orig/src/FSFinder.c 2006-07-23 09:24:16.000000000 +0200
|
||||
+++ fsviewer-app-0.2.6/src/FSFinder.c 2015-09-02 21:18:39.574691303 +0200
|
||||
@@ -144,7 +144,7 @@
|
||||
WMResizableWindowMask);
|
||||
attributes.window_level = WMNormalWindowLevel;
|
||||
attributes.extra_flags = GSFullKeyboardEventsFlag;
|
||||
- attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr |
|
||||
+ attributes.flags = (/*GSWindowStyleAttr |*/ GSWindowLevelAttr |
|
||||
GSExtraFlagsAttr);
|
||||
WMSetWindowAttributes(finder->dpy, WMWidgetXID(finder->win),
|
||||
&attributes);
|
||||
diff -Naur fsviewer-app-0.2.6.orig/src/FSViewer.c fsviewer-app-0.2.6/src/FSViewer.c
|
||||
--- fsviewer-app-0.2.6.orig/src/FSViewer.c 2007-10-14 17:29:04.000000000 +0200
|
||||
+++ fsviewer-app-0.2.6/src/FSViewer.c 2015-09-02 21:18:39.574691303 +0200
|
||||
@@ -161,7 +161,7 @@
|
||||
attributes.window_level = WMFloatingWindowLevel;
|
||||
attributes.extra_flags = GSFullKeyboardEventsFlag;
|
||||
attributes.flags =
|
||||
- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
|
||||
+ (/*GSWindowStyleAttr |*/ GSWindowLevelAttr | GSExtraFlagsAttr);
|
||||
WMSetWindowAttributes(fsViewer->dpy, window, &attributes);
|
||||
WMAppAddWindow(fsViewer->wmContext, window);
|
||||
|
||||
@@ -189,7 +189,7 @@
|
||||
attributes.window_level = WMNormalWindowLevel;
|
||||
attributes.extra_flags = GSFullKeyboardEventsFlag;
|
||||
attributes.flags =
|
||||
- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
|
||||
+ (/*GSWindowStyleAttr |*/ GSWindowLevelAttr | GSExtraFlagsAttr);
|
||||
WMSetWindowAttributes(fsViewer->dpy, window, &attributes);
|
||||
WMAppAddWindow(fsViewer->wmContext, window);
|
||||
}
|
||||
@@ -216,7 +216,7 @@
|
||||
attributes.window_level = WMFloatingWindowLevel;
|
||||
attributes.extra_flags = GSFullKeyboardEventsFlag;
|
||||
attributes.flags =
|
||||
- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
|
||||
+ (/*GSWindowStyleAttr |*/ GSWindowLevelAttr | GSExtraFlagsAttr);
|
||||
WMSetWindowAttributes(fsViewer->dpy, window, &attributes);
|
||||
WMAppAddWindow(fsViewer->wmContext, window);
|
||||
}
|
||||
@@ -476,6 +476,7 @@
|
||||
bindtextdomain("FSViewer", getenv("NLSPATH"));
|
||||
else
|
||||
bindtextdomain("FSViewer", LOCALEDIR);
|
||||
+ bind_textdomain_codeset("FSViewer", "UTF-8");
|
||||
textdomain("FSViewer");
|
||||
|
||||
if (!XSupportsLocale()) {
|
||||
@@ -0,0 +1,47 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit autotools eutils multilib
|
||||
|
||||
MY_P=${PN}-app-${PV}
|
||||
|
||||
DESCRIPTION="A file system viewer for Window Maker"
|
||||
HOMEPAGE="http://www.bayernline.de/~gscholz/linux/fsviewer/"
|
||||
SRC_URI="http://www.bayernline.de/~gscholz/linux/${PN}/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE="nls"
|
||||
|
||||
RDEPEND=">=x11-wm/windowmaker-0.95.2
|
||||
x11-libs/libXft
|
||||
x11-libs/libXpm
|
||||
x11-libs/libX11"
|
||||
DEPEND="${RDEPEND}
|
||||
x11-proto/xproto
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
DOCS="AUTHORS ChangeLog NEWS README"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-configure.patch
|
||||
epatch "${FILESDIR}"/${P}-wmaker-0.95_support.patch
|
||||
epatch "${FILESDIR}"/${P}-fix_title_bar.patch
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable nls) \
|
||||
--with-appspath=/usr/$(get_libdir)/GNUstep
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dosym /usr/$(get_libdir)/GNUstep/FSViewer.app/FSViewer /usr/bin/FSViewer
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
DIST pidgin-sipe-1.18.0.tar.gz 1090904 SHA256 f1388799e3d250fe43643ee8748a6769f67f9c544e3b91fbb25af76b30675efc SHA512 f7d50b26656cd83f13ee24412ca97ab5ffe325c13d32855f9e8c788d5c8a11cb942c12d6888c4992c037320500265441eba9bc8e4eb5c21190eb372abd6b4451 WHIRLPOOL c97693bf54b0dba3f583891714edb63971b2669d1fc0ed41eb94009cfa2b78e37fdee42db325c74f4e4fc76cf29af5fd7cc67b598a3d672623ec1c392561ba86
|
||||
DIST pidgin-sipe-1.19.0.tar.gz 1127851 SHA256 bc144de259e858c57d82ee7ac00a78cc3a0875ab67da6b25be05808ed274c856 SHA512 96fd7f852c7225d2ae71ec4916491c6c4facbddf9f19285334a47b6abbaa80ad7f2aa299fc1b453a7f5782f65b8f56557f5992ba8e3e2c386318d96f1f59824e WHIRLPOOL 90c1069b38e96f6bc2c39957f9c76635f404a3188abb59004fe3a83e177803db06b6c6bcfdef5cf5fb645d901751130b15e619bf2d8fac17fb70660cf2e2ff2c
|
||||
DIST pidgin-sipe-1.19.1.tar.gz 1134961 SHA256 92c8a4611f1594096fac3c5b983df49cb8d1612cab7352799c855fd9dda0454a SHA512 4ac85f5e2ae590677b73ec339051c210173a37c974076d696409c81680e91818d9a3b75a95b4ae556a61ec0246f0cd6fb2a644889bbbb02528d5ea75140efef0 WHIRLPOOL d31044889ae6d9d146e4a9e9bb9fd1ec84ded6597b783cfedb1f1a0478760aeca41fd574bbe8021223957fd6c84cc3082cc2cabdd0da245365573e35697d680f
|
||||
DIST pidgin-sipe-1.20.0.tar.gz 1141962 SHA256 3a6b81f40d7a80d5e467c36b92d550b3c5377b39b67953b576308ce257c2a891 SHA512 f0c9df51d3d16aeca5cf04a2cf68c1b61796a5c97ea444d86995d7034994d3e7fa66b8fa258a1fed765d6b055138b397641316c9b4f43b03b7f152ef5d66ecfd WHIRLPOOL eb100cac4714d4e7b830e7d50ccf034ec036b121a50348ea3148370fb5a54e130edd910ecdb010df1a23ad8b68b41a206c313ea7ee3f2f8bd37deb469853fcf4
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit autotools eutils
|
||||
|
||||
DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
|
||||
HOMEPAGE="http://sipe.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE="debug kerberos ocs2005-message-hack openssl telepathy voice"
|
||||
|
||||
RDEPEND=">=dev-libs/gmime-2.4.16
|
||||
dev-libs/libxml2
|
||||
openssl? ( dev-libs/openssl:= )
|
||||
!openssl? ( dev-libs/nss )
|
||||
kerberos? ( virtual/krb5 )
|
||||
voice? (
|
||||
>=dev-libs/glib-2.28.0
|
||||
>=net-libs/libnice-0.1.0
|
||||
media-libs/gstreamer:0.10
|
||||
>=net-im/pidgin-2.8.0
|
||||
)
|
||||
!voice? (
|
||||
>=dev-libs/glib-2.12.0:2
|
||||
net-im/pidgin
|
||||
)
|
||||
telepathy? (
|
||||
>=sys-apps/dbus-1.1.0
|
||||
>=dev-libs/dbus-glib-0.61
|
||||
>=dev-libs/glib-2.28:2
|
||||
>=net-libs/telepathy-glib-0.18.0
|
||||
)
|
||||
"
|
||||
|
||||
DEPEND="dev-util/intltool
|
||||
virtual/pkgconfig
|
||||
${RDEPEND}
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--enable-purple \
|
||||
--disable-quality-check \
|
||||
$(use_enable telepathy) \
|
||||
$(use_enable debug) \
|
||||
$(use_enable ocs2005-message-hack) \
|
||||
$(use_with kerberos krb5) \
|
||||
$(use_with voice vv) \
|
||||
$(use_enable !openssl nss) \
|
||||
$(use_enable openssl)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}"
|
||||
dodoc AUTHORS ChangeLog NEWS TODO README
|
||||
}
|
||||
Reference in New Issue
Block a user