mirror of
https://github.com/gryf/gryf-overlay.git
synced 2025-12-25 16:02:30 +01:00
Removed jpilot build, all fixes are in usptream
This commit is contained in:
@@ -1,4 +0,0 @@
|
||||
AUX jpilot-1.8.2-fix-paths.patch 3619 BLAKE2B 01d77eb206f2ce4c1f28b2950334f0814fb398cc61bc4164e573a7290b6ff0a1d6c710c6932ce0170b8634459beb8f2f53c296b3fcf79ea56d8ca061459babd4 SHA512 25e026aafc04e488183a7537f37566b30c1300f090cc1b4c9eca6531e30654751e10f72c8d45f0ad1bcfa441c659380831de520f41906daec61b4b069fc84f81
|
||||
AUX jpilot-1.8.2-qa-desktop-file.patch 280 BLAKE2B 8a84005ce60627cea1f6b8b9ce96e824a65b621d63706703d15a3dd1ed48945ab100927a885d8c7e40c2688194f89a151be96729b26d6cb4d081024095ed3178 SHA512 ccc59b87c5e7f9074e83e9c3a47799c6779c29583fbd9845a26ad735342b22bf390bf8bed50dc2adac097dea00823ea587c8a5abdce4c197f5160e59c4617a37
|
||||
DIST jpilot-1.8.2.tar.gz 1740735 BLAKE2B efc9fb8e88843d6e0f4f2245753d67856c9d0cd455c9a22c829bb103631fd8a8111ead3cb4bc434a6be00ad0cb35fe554a9ebbe1f2d38bfaf560e1b414c62260 SHA512 733dd51a2acc60760bb1ffaa0d7b4433584a571793d5e4f857492349bae8d032625baf9f0060e619d760628ddda3559bf4be057f45f4dc17ddf1af1ca795c024
|
||||
EBUILD jpilot-1.8.2-r10.ebuild 989 BLAKE2B 070e9dd7a6731ac2dbf2c0c0925491403f8c747210dda0703e652c5b9e693bbcae4ff83c336f32b275c7d70971d84469cd376265b97939aaca1594c2579b28f0 SHA512 dcd83841d6cfe66033fcbb42a54ba68472613233cdb40c5620846f5cf85c61217d75cbaf3f445052a77c708dd69ba1b9885c7968492102cee659cd51bb494858
|
||||
@@ -1,119 +0,0 @@
|
||||
* Modify Makefile.am's to be compliant with GNU and Gentoo filesystem conventions
|
||||
* Use redefinable variables instead of hard-replacing @VAR@-style variables
|
||||
* Replace abuse of 'libdir' install path variables
|
||||
|
||||
--- a/docs/Makefile.am
|
||||
+++ b/docs/Makefile.am
|
||||
@@ -3,19 +3,17 @@
|
||||
man_MANS = jpilot.1 jpilot-dial.1 jpilot-sync.1 jpilot-dump.1 jpilot-merge.1
|
||||
|
||||
# Install the standard GNU doc files
|
||||
-miscdir = $(datadir)/doc/$(PACKAGE)
|
||||
+miscdir = $(docdir)
|
||||
misc_DATA = \
|
||||
../BUGS \
|
||||
../ChangeLog \
|
||||
- ../COPYING \
|
||||
../AUTHORS \
|
||||
- ../INSTALL \
|
||||
../README \
|
||||
../TODO
|
||||
|
||||
# Install the manual docs
|
||||
-docdir = $(miscdir)/manual
|
||||
-doc_DATA = \
|
||||
+manualdir = $(htmldir)
|
||||
+manual_DATA = \
|
||||
manual.html \
|
||||
plugin.html \
|
||||
jpilot-address.png \
|
||||
--- a/Expense/Makefile.am
|
||||
+++ b/Expense/Makefile.am
|
||||
@@ -1,11 +1,11 @@
|
||||
-libdir = @libdir@/@PACKAGE@/plugins
|
||||
+pluginsdir = $(libdir)/$(PACKAGE)/plugins
|
||||
|
||||
if MAKE_EXPENSE
|
||||
|
||||
-lib_LTLIBRARIES = libexpense.la
|
||||
+plugins_LTLIBRARIES = libexpense.la
|
||||
libexpense_la_SOURCES = expense.c
|
||||
-libexpense_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
|
||||
+libexpense_la_CFLAGS = $(PILOT_FLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
libexpense_la_LDFLAGS = -module -avoid-version
|
||||
-libexpense_la_LIBADD = @GTK_LIBS@
|
||||
+libexpense_la_LIBADD = $(GTK_LIBS)
|
||||
|
||||
endif
|
||||
--- a/icons/Makefile.am
|
||||
+++ b/icons/Makefile.am
|
||||
@@ -1,4 +1,4 @@
|
||||
-icondir = $(datadir)/doc/$(PACKAGE)/icons
|
||||
+icondir = $(docdir)/icons
|
||||
icon_DATA = \
|
||||
jpilot-icon1.xpm \
|
||||
jpilot-icon2.xpm \
|
||||
--- a/KeyRing/Makefile.am
|
||||
+++ b/KeyRing/Makefile.am
|
||||
@@ -1,13 +1,13 @@
|
||||
-libdir = @libdir@/@PACKAGE@/plugins
|
||||
+pluginsdir = $(libdir)/$(PACKAGE)/plugins
|
||||
|
||||
EXTRA_DIST = README
|
||||
|
||||
if MAKE_KEYRING
|
||||
|
||||
-lib_LTLIBRARIES = libkeyring.la
|
||||
+plugins_LTLIBRARIES = libkeyring.la
|
||||
libkeyring_la_SOURCES = keyring.c
|
||||
-libkeyring_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ @LIBGCRYPT_CFLAGS@ -I$(top_srcdir)
|
||||
+libkeyring_la_CFLAGS = $(PILOT_FLAGS) $(GTK_CFLAGS) $(LIBGCRYPT_CFLAGS) -I$(top_srcdir)
|
||||
libkeyring_la_LDFLAGS = -module -avoid-version
|
||||
-libkeyring_la_LIBADD = @OPENSSL_LIBS@ @GTK_LIBS@ @LIBGCRYPT_LIBS@
|
||||
+libkeyring_la_LIBADD = $(OPENSSL_LIBS) $(GTK_LIBS) $(LIBGCRYPT_LIBS)
|
||||
|
||||
endif
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -161,18 +161,17 @@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
# Add i18n support
|
||||
-localedir = $(datadir)/locale
|
||||
I18NDEFS = -DLOCALEDIR=\"$(localedir)\"
|
||||
|
||||
-AM_CFLAGS= @PILOT_FLAGS@ @GTK_CFLAGS@ ${I18NDEFS}
|
||||
+AM_CFLAGS= $(PILOT_FLAGS) $(GTK_CFLAGS) $(I18NDEFS)
|
||||
|
||||
# Add linkflags
|
||||
jpilot_LDFLAGS = -export-dynamic
|
||||
-jpilot_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@
|
||||
-jpilot_dump_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@
|
||||
+jpilot_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS)
|
||||
+jpilot_dump_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS)
|
||||
jpilot_sync_LDFLAGS = -export-dynamic
|
||||
-jpilot_sync_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@
|
||||
-jpilot_merge_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@
|
||||
+jpilot_sync_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS)
|
||||
+jpilot_merge_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS)
|
||||
|
||||
################################################################################
|
||||
## The rest of the file is copied over to the Makefile with only variable
|
||||
--- a/SyncTime/Makefile.am
|
||||
+++ b/SyncTime/Makefile.am
|
||||
@@ -1,11 +1,11 @@
|
||||
-libdir = @libdir@/@PACKAGE@/plugins
|
||||
+pluginsdir = $(libdir)/$(PACKAGE)/plugins
|
||||
|
||||
if MAKE_SYNCTIME
|
||||
|
||||
-lib_LTLIBRARIES = libsynctime.la
|
||||
+plugins_LTLIBRARIES = libsynctime.la
|
||||
libsynctime_la_SOURCES = synctime.c
|
||||
-libsynctime_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
|
||||
+libsynctime_la_CFLAGS = $(PILOT_FLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
libsynctime_la_LDFLAGS = -module -avoid-version
|
||||
-libsynctime_la_LIBADD = @GTK_LIBS@
|
||||
+libsynctime_la_LIBADD = $(GTK_LIBS)
|
||||
|
||||
endif
|
||||
@@ -1,13 +0,0 @@
|
||||
* The 'Icon=' property should not have a suffix
|
||||
|
||||
--- a/jpilot.desktop
|
||||
+++ b/jpilot.desktop
|
||||
@@ -2,7 +2,7 @@
|
||||
Name=J-Pilot
|
||||
Comment=Desktop organizer application for the Palm Pilot
|
||||
Exec=jpilot
|
||||
-Icon=jpilot.xpm
|
||||
+Icon=jpilot
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Office;PDA;
|
||||
@@ -1,50 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="Desktop Organizer Software for the Palm Pilot"
|
||||
HOMEPAGE="http://www.jpilot.org/"
|
||||
SRC_URI="http://jpilot.org/tarballs/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
|
||||
IUSE="nls"
|
||||
|
||||
RDEPEND="
|
||||
app-pda/pilot-link
|
||||
dev-libs/libgcrypt:0=
|
||||
x11-libs/gtk+:2"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? (
|
||||
dev-util/intltool
|
||||
sys-devel/gettext
|
||||
)
|
||||
virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.8.2-qa-desktop-file.patch
|
||||
"${FILESDIR}"/${PN}-1.8.2-fix-paths.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i -e 's|_UNQUOTED(ABILIB, "lib"|_UNQUOTED(ABILIB, "'$(get_libdir)'"|' configure.in
|
||||
mv configure.{in,ac} || die
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf $(use_enable nls)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
docompress -x /usr/share/doc/${PF}/icons
|
||||
|
||||
# .la files for plugins are useless
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
Reference in New Issue
Block a user