Import of pkgsrc-2015Q2
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
# $NetBSD: Makefile,v 1.99 2014/11/22 20:49:59 bsiegert Exp $
|
||||
# $NetBSD: Makefile,v 1.101 2015/05/19 10:58:46 bad Exp $
|
||||
#
|
||||
|
||||
DISTNAME= jpilot-1.8.1
|
||||
PKGREVISION= 4
|
||||
DISTNAME= jpilot-1.8.2
|
||||
CATEGORIES= comms
|
||||
MASTER_SITES= http://www.jpilot.org/
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@comment $NetBSD: PLIST,v 1.14 2013/10/10 10:58:38 bad Exp $
|
||||
@comment $NetBSD: PLIST,v 1.15 2015/05/19 10:58:46 bad Exp $
|
||||
bin/jpilot
|
||||
bin/jpilot-dump
|
||||
bin/jpilot-merge
|
||||
@@ -11,6 +11,7 @@ lib/jpilot/plugins/libkeyring.la
|
||||
lib/jpilot/plugins/libsynctime.la
|
||||
man/man1/jpilot-dial.1
|
||||
man/man1/jpilot-dump.1
|
||||
man/man1/jpilot-merge.1
|
||||
man/man1/jpilot-sync.1
|
||||
man/man1/jpilot.1
|
||||
share/applications/jpilot.desktop
|
||||
@@ -50,7 +51,7 @@ share/jpilot/CalendarDB-PDat.pdb
|
||||
share/jpilot/ContactsDB-PAdd.pdb
|
||||
share/jpilot/DatebookDB.pdb
|
||||
share/jpilot/ExpenseDB.pdb
|
||||
share/jpilot/MańanaDB.pdb
|
||||
share/jpilot/MananaDB.pdb
|
||||
share/jpilot/Memo32DB.pdb
|
||||
share/jpilot/MemoDB.pdb
|
||||
share/jpilot/MemosDB-PMem.pdb
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $NetBSD: buildlink3.mk,v 1.34 2014/05/05 00:47:41 ryoon Exp $
|
||||
# $NetBSD: buildlink3.mk,v 1.35 2015/04/25 14:20:29 tnn Exp $
|
||||
|
||||
BUILDLINK_TREE+= jpilot
|
||||
|
||||
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= jpilot
|
||||
JPILOT_BUILDLINK3_MK:=
|
||||
|
||||
BUILDLINK_API_DEPENDS.jpilot+= jpilot>=1.6.0
|
||||
BUILDLINK_ABI_DEPENDS.jpilot+= jpilot>=1.8.1nb4
|
||||
BUILDLINK_ABI_DEPENDS.jpilot+= jpilot>=1.8.1nb5
|
||||
BUILDLINK_PKGSRCDIR.jpilot?= ../../comms/jpilot
|
||||
|
||||
.include "../../comms/pilot-link-libs/buildlink3.mk"
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
$NetBSD: distinfo,v 1.24 2013/10/14 14:33:31 joerg Exp $
|
||||
$NetBSD: distinfo,v 1.25 2015/05/19 10:58:46 bad Exp $
|
||||
|
||||
SHA1 (jpilot-1.8.1.tar.gz) = 98a70bbb30bcccb8ba74aecb6a41b819dc8a4a3b
|
||||
RMD160 (jpilot-1.8.1.tar.gz) = 4b40d625d4582994eeb5acfa296ed0925a59b7bd
|
||||
Size (jpilot-1.8.1.tar.gz) = 1582869 bytes
|
||||
SHA1 (patch-utils.c) = 3e7551d0859820cc103a6c5cbfbac8d4ff21eee9
|
||||
SHA1 (patch-utils.h) = 950d4de9824620847ca8b7f197d788c666a69d81
|
||||
SHA1 (jpilot-1.8.2.tar.gz) = 3348bf3e49928f4b5202bac546ab62852155291c
|
||||
RMD160 (jpilot-1.8.2.tar.gz) = b162f2e2f91ef9fd4fc07026312f0f21ddbc345a
|
||||
Size (jpilot-1.8.2.tar.gz) = 1740735 bytes
|
||||
SHA1 (patch-memo.c) = 9390f307c185bdd6a7d89513de5e9e1411f9a0f0
|
||||
|
||||
28
comms/jpilot/patches/patch-memo.c
Normal file
28
comms/jpilot/patches/patch-memo.c
Normal file
@@ -0,0 +1,28 @@
|
||||
/* $NetBSD: patch-memo.c,v 1.1 2015/05/19 10:58:46 bad Exp $ */
|
||||
Only sort memos alphabetically when enabled in the app_info.
|
||||
|
||||
--- memo.c.orig 2014-05-25 03:25:20.000000000 +0000
|
||||
+++ memo.c 2015-05-19 10:51:57.000000000 +0000
|
||||
@@ -262,7 +262,7 @@
|
||||
|
||||
static int memo_sort(MemoList **memol, int sort_order)
|
||||
{
|
||||
- /* struct MemoAppInfo memo_ai; */
|
||||
+ struct MemoAppInfo memo_ai;
|
||||
MemoList *temp_memol;
|
||||
MemoList **sort_memol;
|
||||
int count, i;
|
||||
@@ -291,13 +291,10 @@
|
||||
sort_memol[i] = temp_memol;
|
||||
}
|
||||
|
||||
- /* TODO: Restore code when syncing of AppInfo blocks is implemented
|
||||
get_memo_app_info(&memo_ai);
|
||||
if (memo_ai.sortByAlpha==1) {
|
||||
qsort(sort_memol, count, sizeof(MemoList *), memo_compare);
|
||||
}
|
||||
- */
|
||||
- qsort(sort_memol, count, sizeof(MemoList *), memo_compare);
|
||||
|
||||
/* Put the linked list in the order of the array */
|
||||
if (sort_order==SORT_ASCENDING) {
|
||||
@@ -1,13 +0,0 @@
|
||||
$NetBSD: patch-utils.c,v 1.1 2013/10/14 14:33:31 joerg Exp $
|
||||
|
||||
--- utils.c.orig 2013-10-14 13:14:27.000000000 +0000
|
||||
+++ utils.c
|
||||
@@ -899,7 +899,7 @@ void clist_clear(GtkCList *clist)
|
||||
|
||||
/* Encapsulate GTK tooltip function which no longer supports disabling as
|
||||
* of GTK 2.12 */
|
||||
-inline void set_tooltip(int show_tooltip,
|
||||
+void set_tooltip(int show_tooltip,
|
||||
GtkTooltips *tooltips,
|
||||
GtkWidget *widget,
|
||||
const gchar *tip_text,
|
||||
@@ -1,13 +0,0 @@
|
||||
$NetBSD: patch-utils.h,v 1.1 2013/10/14 14:33:31 joerg Exp $
|
||||
|
||||
--- utils.h.orig 2013-10-14 13:14:44.000000000 +0000
|
||||
+++ utils.h
|
||||
@@ -349,7 +349,7 @@ void entry_set_multiline_truncate(GtkEnt
|
||||
|
||||
void clist_clear(GtkCList *clist);
|
||||
|
||||
-inline void set_tooltip(int show_tooltip,
|
||||
+void set_tooltip(int show_tooltip,
|
||||
GtkTooltips *tooltips,
|
||||
GtkWidget *widget,
|
||||
const gchar *tip_text,
|
||||
Reference in New Issue
Block a user