summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/pacman/PKGBUILD8
-rw-r--r--libre/pacman/makepkg.conf4
-rw-r--r--libre/pacman/pacman.install76
-rw-r--r--nonprism/sylpheed-nonprism/PKGBUILD52
-rw-r--r--nonprism/sylpheed-nonprism/nonprism.patch168
-rw-r--r--nonprism/sylpheed-nonprism/sylpheed.install11
6 files changed, 236 insertions, 83 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 1dec5dcc9..ab0f3fb57 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,11 +1,11 @@
# vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 188692 2013-06-18 04:04:38Z allan $
+# $Id: PKGBUILD 197027 2013-10-21 14:05:24Z allan $
# Maintainer: Dan McGee <dan@archlinux.org>
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=pacman
pkgver=4.1.2
-pkgrel=1
+pkgrel=4
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.archlinux.org/pacman/"
@@ -19,8 +19,6 @@ provides=('pacman-contrib')
conflicts=('pacman-contrib')
replaces=('pacman-contrib')
backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
-options=(!libtool)
source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
pacman.conf.i686
pacman.conf.x86_64
@@ -31,7 +29,7 @@ md5sums=('063c8b0ff6bdf903dc235445525627cd'
'688feb0a552f42643a76f72e7198bfe4'
'765858b55d2112d948932fc645ea538b'
'9e0c64937ef751ae4273fa4d73381484'
- '7984963d89784d26b5c50218e2138467')
+ 'f0f310df411f943dbc4e2dd376c88662')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf
index a4e7ceada..758d7d029 100644
--- a/libre/pacman/makepkg.conf
+++ b/libre/pacman/makepkg.conf
@@ -67,7 +67,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign)
# These are default values for the options=() settings
#########################################################################
#
-# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
+# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
# A negated option will do the opposite of the comments below.
#
#-- strip: Strip symbols from binaries/libraries
@@ -80,7 +80,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign)
#-- upx: Compress binary executable files using UPX
#-- debug: Add debugging flags as specified in DEBUG_* variables
#
-OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
INTEGRITY_CHECK=(md5)
diff --git a/libre/pacman/pacman.install b/libre/pacman/pacman.install
deleted file mode 100644
index 5dc55c0c2..000000000
--- a/libre/pacman/pacman.install
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- # one time stuff for md5sum issue with older pacman versions
- if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then
- _resetbackups
- fi
- if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then
- _warnupgrade
- fi
- if [ ! -f "etc/pacman.d/gnupg/pubring.gpg" ] || [ "$(vercmp $2 4.0.3-2)" -lt 0 ]; then
- _check_pubring
- fi
-}
-
-post_install() {
- _check_pubring
-}
-
-_check_pubring() {
- echo " >>> Run \`pacman-key --init; pacman-key --populate archlinux\`"
- echo " >>> And \`pacman-key --populate parabola\`"
- echo " >>> to import the data required by pacman for package verification."
- echo " >>> See: https://www.archlinux.org/news/having-pacman-verify-packages"
-}
-
-_warnupgrade() {
- echo ">>> The pacman database format has changed as of pacman 3.5.0."
- echo ">>> You will need to run \`pacman-db-upgrade\` as root."
- echo ">>>"
-}
-
-_resetbackups() {
- echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset"
- echo ">>> you are able to remove all NoUpgrade lines of already protected"
- echo ">>> files from pacman.conf."
- echo ">>>"
-
- # path variables
- pacconf="/etc/pacman.conf"
- dbpath="/var/lib/pacman/local"
-
- # get a list of NoUpgrade files from the user's pacman.conf
- echo ">>> Retrieving pacman.conf NoUpgrade list..."
- config=$(grep "^NoUpgrade" $pacconf | cut -d'=' -f2)
- # add the standard list of files, even if they are already above
- config="$config \
- etc/passwd etc/group etc/shadow etc/sudoers \
- etc/fstab etc/raidtab etc/ld.so.conf \
- etc/rc.conf etc/rc.local \
- etc/modprobe.conf etc/modules.conf \
- etc/lilo.conf boot/grub/menu.lst"
-
- # blank md5sum for use in sed expression
- zeroes='00000000000000000000000000000000'
-
- for file in $config; do
- echo ">>> -> finding owner of /$file..."
- line=$(LC_ALL=C LANG=C pacman -Qo /$file 2>/dev/null)
- # if file is owned by a package, go find its incorrectly stored sum
- if [ ! -z "$line" ]; then
- # get the name and version of the package owning file
- name=$(echo $line | awk '{print $5}')
- version=$(echo $line | awk '{print $6}')
- # set the path to the backup array holding the md5sum
- path="$dbpath/$name-$version/files"
- # run a sed on the path to reset the line containing $file
- # NOTE: literal tab characters in sed expression after $file
- echo ">>> -> resetting sum of /$file..."
- sed -i "s#$file [0-9a-fA-F]*#$file $zeroes#" $path
- else
- echo ">>> -> $file is unowned."
- fi
- done
-}
diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed-nonprism/PKGBUILD
new file mode 100644
index 000000000..34d15ce73
--- /dev/null
+++ b/nonprism/sylpheed-nonprism/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 79630 2012-11-09 11:59:02Z speps $
+# Maintainer: speps <speps at aur dot archlinux dot org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: dorphell <dorphell@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Contributor (Parabola): Aditya Som <icarious@hacari.org>"
+
+_pkgname=sylpheed
+pkgname=sylpheed-nonprism
+pkgver=3.3.0
+pkgrel=1
+pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support"
+arch=('i686' 'x86_64')
+url="http://sylpheed.sraoss.jp/en/"
+license=('GPL')
+depends=('gpgme' 'gtkspell' 'desktop-file-utils')
+makedepends=('compface' 'openssl')
+options=('!libtool')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+install="$_pkgname.install"
+source=("http://sylpheed.sraoss.jp/$_pkgname/v3.3/$_pkgname-$pkgver.tar.bz2"
+ 'nonprism.patch')
+md5sums=('20442f81dbb4e7c59462360ad0bb1afb'
+ 'e1bddc14962e607cdb899ec082660639')
+
+prepare() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ # Remove Gmail support
+ patch -Np1 -i "$srcdir/nonprism.patch"
+}
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ ./configure --prefix=/usr \
+ --enable-ldap
+ make
+
+ # Build Attachment-Tool Plug-in
+ cd plugin/attachment_tool && make
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
+
+ # Install Attachment-Tool Plug-in
+ cd plugin/attachment_tool
+ make DESTDIR="$pkgdir/" install-plugin
+}
diff --git a/nonprism/sylpheed-nonprism/nonprism.patch b/nonprism/sylpheed-nonprism/nonprism.patch
new file mode 100644
index 000000000..50d000634
--- /dev/null
+++ b/nonprism/sylpheed-nonprism/nonprism.patch
@@ -0,0 +1,168 @@
+diff -Nur a/src/setup.c b/src/setup.c
+--- a/src/setup.c 2010-08-19 02:23:28.000000000 -0300
++++ b/src/setup.c 2013-10-23 15:10:24.439721307 -0200
+@@ -327,10 +327,6 @@
+ GtkWidget *cancel_btn;
+ GtkWidget *pop3_radio;
+ GtkWidget *imap_radio;
+-#if USE_SSL
+- GtkWidget *pop3g_radio;
+- GtkWidget *imapg_radio;
+-#endif
+ GtkWidget *name_entry;
+ GtkWidget *addr_entry;
+ GtkWidget *id_entry;
+@@ -378,15 +374,8 @@
+ {
+ SETUP_TYPE_POP3,
+ SETUP_TYPE_IMAP,
+-#if USE_SSL
+- SETUP_TYPE_POP3G,
+- SETUP_TYPE_IMAPG
+-#endif
+ };
+
+-#define GMAIL_POP3_SERVER "pop.gmail.com"
+-#define GMAIL_IMAP_SERVER "imap.gmail.com"
+-#define GMAIL_SMTP_SERVER "smtp.gmail.com"
+ #define POP3_PORT 110
+ #define IMAP_PORT 143
+ #define SMTP_PORT 25
+@@ -410,14 +399,6 @@
+ serv = gtk_entry_get_text(GTK_ENTRY(setupac.serv_entry));
+ smtp = gtk_entry_get_text(GTK_ENTRY(setupac.smtp_entry));
+
+-#if USE_SSL
+- if (setupac.type == SETUP_TYPE_POP3G ||
+- setupac.type == SETUP_TYPE_IMAPG) {
+- if (GTK_WIDGET(editable) == setupac.addr_entry)
+- gtk_entry_set_text(GTK_ENTRY(setupac.id_entry), addr);
+- }
+-#endif
+-
+ if (page == SETUP_PAGE_ADDRESS && name && *name && addr && *addr)
+ next_enable = TRUE;
+ else if (page == SETUP_PAGE_ACCOUNT &&
+@@ -436,8 +417,6 @@
+ p = str = gtk_entry_get_text(GTK_ENTRY(entry));
+ if (!str || *p == '\0')
+ return FALSE;
+- if (!strcmp(str, "(username)@gmail.com"))
+- return FALSE;
+
+ while (*p) {
+ c = *p;
+@@ -480,14 +459,6 @@
+ } else if (response_id == GTK_RESPONSE_ACCEPT) {
+ if (prev_page == SETUP_PAGE_ADDRESS) {
+ if (entry_is_valid(setupac.addr_entry)) {
+-#if USE_SSL
+- if (setupac.type == SETUP_TYPE_POP3G ||
+- setupac.type == SETUP_TYPE_IMAPG)
+- gtk_notebook_set_current_page
+- (GTK_NOTEBOOK(setupac.notebook),
+- SETUP_PAGE_FINISH);
+- else
+-#endif
+ gtk_notebook_set_current_page
+ (GTK_NOTEBOOK(setupac.notebook), page + 1);
+ } else
+@@ -508,10 +479,6 @@
+ if (prev_page == SETUP_PAGE_START) {
+ setupac.type = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.pop3_radio)) ? SETUP_TYPE_POP3
+ : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.imap_radio)) ? SETUP_TYPE_IMAP
+-#if USE_SSL
+- : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.pop3g_radio)) ? SETUP_TYPE_POP3G
+- : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.imapg_radio)) ? SETUP_TYPE_IMAPG
+-#endif
+ : SETUP_TYPE_POP3;
+ }
+ } else if (response_id == GTK_RESPONSE_REJECT) {
+@@ -539,28 +506,6 @@
+ gtk_widget_set_sensitive(setupac.serv_entry, TRUE);
+ gtk_widget_set_sensitive(setupac.smtp_entry, TRUE);
+ break;
+-#if USE_SSL
+- case SETUP_TYPE_POP3G:
+- if (prev_page == SETUP_PAGE_START)
+- gtk_entry_set_text(GTK_ENTRY(setupac.addr_entry), "(username)@gmail.com");
+- gtk_widget_set_sensitive(setupac.id_entry, FALSE);
+- gtk_label_set_text(GTK_LABEL(setupac.serv_label_name1), _("POP3 server:"));
+- gtk_entry_set_text(GTK_ENTRY(setupac.serv_entry), GMAIL_POP3_SERVER);
+- gtk_widget_set_sensitive(setupac.serv_entry, FALSE);
+- gtk_entry_set_text(GTK_ENTRY(setupac.smtp_entry), GMAIL_SMTP_SERVER);
+- gtk_widget_set_sensitive(setupac.smtp_entry, FALSE);
+- break;
+- case SETUP_TYPE_IMAPG:
+- if (prev_page == SETUP_PAGE_START)
+- gtk_entry_set_text(GTK_ENTRY(setupac.addr_entry), "(username)@gmail.com");
+- gtk_widget_set_sensitive(setupac.id_entry, FALSE);
+- gtk_label_set_text(GTK_LABEL(setupac.serv_label_name1), _("IMAP4 server:"));
+- gtk_entry_set_text(GTK_ENTRY(setupac.serv_entry), GMAIL_IMAP_SERVER);
+- gtk_widget_set_sensitive(setupac.serv_entry, FALSE);
+- gtk_entry_set_text(GTK_ENTRY(setupac.smtp_entry), GMAIL_SMTP_SERVER);
+- gtk_widget_set_sensitive(setupac.smtp_entry, FALSE);
+- break;
+-#endif /* USE_SSL */
+ }
+ } else if (page == SETUP_PAGE_FINISH) {
+ prev_enable = FALSE;
+@@ -595,24 +540,6 @@
+ setupac.smtp_auth = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.smtpauth_chkbtn));
+ gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("IMAP4 server:"));
+ break;
+-#if USE_SSL
+- case SETUP_TYPE_POP3G:
+- setupac.serv_ssl = TRUE;
+- setupac.smtp_ssl = TRUE;
+- setupac.smtp_auth = TRUE;
+- setupac.serv_port = POP3S_PORT;
+- setupac.smtp_port = SMTPS_PORT;
+- gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("POP3 server:"));
+- break;
+- case SETUP_TYPE_IMAPG:
+- setupac.serv_ssl = TRUE;
+- setupac.smtp_ssl = TRUE;
+- setupac.smtp_auth = TRUE;
+- setupac.serv_port = IMAPS_PORT;
+- setupac.smtp_port = SMTPS_PORT;
+- gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("IMAP4 server:"));
+- break;
+-#endif /* USE_SSL */
+ }
+
+ GET_STR(name, name_entry);
+@@ -756,14 +683,6 @@
+ setupac.imap_radio = gtk_radio_button_new_with_label_from_widget
+ (GTK_RADIO_BUTTON(setupac.pop3_radio), "IMAP4");
+ gtk_box_pack_start(GTK_BOX(vbox), setupac.imap_radio, FALSE, FALSE, 0);
+-#if USE_SSL
+- setupac.pop3g_radio = gtk_radio_button_new_with_label_from_widget
+- (GTK_RADIO_BUTTON(setupac.pop3_radio), "POP3 (Gmail)");
+- gtk_box_pack_start(GTK_BOX(vbox), setupac.pop3g_radio, FALSE, FALSE, 0);
+- setupac.imapg_radio = gtk_radio_button_new_with_label_from_widget
+- (GTK_RADIO_BUTTON(setupac.pop3_radio), "IMAP4 (Gmail)");
+- gtk_box_pack_start(GTK_BOX(vbox), setupac.imapg_radio, FALSE, FALSE, 0);
+-#endif
+
+ /* Page 2 */
+ vbox = gtk_vbox_new(FALSE, 12);
+@@ -991,18 +910,6 @@
+ #endif
+ ac->imapport = setupac.serv_port;
+ break;
+-#if USE_SSL
+- case SETUP_TYPE_POP3G:
+- ac->protocol = A_POP3;
+- ac->ssl_pop = SSL_TUNNEL;
+- ac->popport = setupac.serv_port;
+- break;
+- case SETUP_TYPE_IMAPG:
+- ac->protocol = A_IMAP4;
+- ac->ssl_imap = SSL_TUNNEL;
+- ac->imapport = setupac.serv_port;
+- break;
+-#endif /* USE_SSL */
+ }
+
+ g_free(ac->sig_text);
diff --git a/nonprism/sylpheed-nonprism/sylpheed.install b/nonprism/sylpheed-nonprism/sylpheed.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/nonprism/sylpheed-nonprism/sylpheed.install
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-16 21:47:27 +0000