aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-07-13 11:35:02 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-07-13 11:35:02 +0000
commit6174c20f885740756b61a721cdf0c43b8a85373a (patch)
treed61ae7365ea9fa8bd54e5af8e04f6763305b7fc7 /main
parent5b15e74c8921683361c3a7d68b162f424e8eb3b8 (diff)
downloadaports-6174c20f885740756b61a721cdf0c43b8a85373a.tar.bz2
aports-6174c20f885740756b61a721cdf0c43b8a85373a.tar.xz
community/mousepad: move from main
Diffstat (limited to 'main')
-rw-r--r--main/mousepad/APKBUILD48
-rw-r--r--main/mousepad/Fixup-some-warnings-about-using-NULL-where-it-shoudnt-be.patch84
2 files changed, 0 insertions, 132 deletions
diff --git a/main/mousepad/APKBUILD b/main/mousepad/APKBUILD
deleted file mode 100644
index cba3fd4af8..0000000000
--- a/main/mousepad/APKBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=mousepad
-pkgver=0.4.0
-pkgrel=2
-pkgdesc="Simple Text Editor for Xfce4"
-url="http://foo-projects.org/~benny/xfce/apps.html"
-arch="all"
-license="GPL-2.0-or-later"
-makedepends="gtk+2.0-dev gtksourceview2-dev"
-depends="desktop-file-utils"
-install=""
-subpackages="$pkgname-lang"
-source="http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
- Fixup-some-warnings-about-using-NULL-where-it-shoudnt-be.patch
- "
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
- cd "$_builddir"
- update_config_sub || return 1
-}
-
-build () {
- cd "$_builddir"
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/xfce4 \
- --localstatedir=/var \
- --disable-gtk3 \
- --disable-static \
- || return 1
- make || return 1
-}
-
-package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="f55314c5dda6323883241e6cf01550a7 mousepad-0.4.0.tar.bz2
-b31ccd05bbfdaf185970e592be9ebd9e Fixup-some-warnings-about-using-NULL-where-it-shoudnt-be.patch"
-sha256sums="60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132 mousepad-0.4.0.tar.bz2
-bccc5354e3eca83c608ab952188f4a47605d88cad7e2b48fa426f2057a122c9d Fixup-some-warnings-about-using-NULL-where-it-shoudnt-be.patch"
-sha512sums="5196abd04268d1ace118dc485b72bfcfb7f9175eeaf52bc97c08c1646371d26401403a3bb199d882380bcb998547c65af9bd054f0365afd846c0ad74d3c3b1fe mousepad-0.4.0.tar.bz2
-886e2ff78d8a9083d71421fed8fdc8eea308da75bffb0f2eb6edd09c6606fc2a6706b0354a0f18191f3090e381d8885ea9961360c5cdcd959c4974959a176741 Fixup-some-warnings-about-using-NULL-where-it-shoudnt-be.patch"
diff --git a/main/mousepad/Fixup-some-warnings-about-using-NULL-where-it-shoudnt-be.patch b/main/mousepad/Fixup-some-warnings-about-using-NULL-where-it-shoudnt-be.patch
deleted file mode 100644
index 60fe03c124..0000000000
--- a/main/mousepad/Fixup-some-warnings-about-using-NULL-where-it-shoudnt-be.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 73c93369f7708ab89c46e67e7933b835aafa6811 Mon Sep 17 00:00:00 2001
-From: Matthew Brush <matt@xfce.org>
-Date: Wed, 8 Jul 2015 21:03:33 -0700
-Subject: Fixup some warnings about using NULL where it shouldn't be
-
-Closes #11663
-
-diff --git a/mousepad/mousepad-action-group.c b/mousepad/mousepad-action-group.c
-index 71b37f2..acea132 100644
---- a/mousepad/mousepad-action-group.c
-+++ b/mousepad/mousepad-action-group.c
-@@ -283,7 +283,8 @@ void
- mousepad_action_group_set_active_style_scheme (MousepadActionGroup *self,
- GtkSourceStyleScheme *scheme)
- {
-- GtkAction *action;
-+ GtkAction *action;
-+ const gchar *scheme_name = NULL;
-
- g_return_if_fail (MOUSEPAD_IS_ACTION_GROUP (self));
-
-@@ -303,8 +304,11 @@ mousepad_action_group_set_active_style_scheme (MousepadActionGroup *self,
- self->locked = FALSE;
-
- /* update the setting when the active action is changed */
-+ if (scheme != NULL)
-+ scheme_name = gtk_source_style_scheme_get_id(scheme);
-+
- self->locked = TRUE;
-- MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, gtk_source_style_scheme_get_id (scheme));
-+ MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, scheme_name);
- self->locked = FALSE;
-
- g_object_notify (G_OBJECT (self), "active-style-scheme");
-diff --git a/mousepad/mousepad-settings.c b/mousepad/mousepad-settings.c
-index 13cead5..4c2f5bc 100644
---- a/mousepad/mousepad-settings.c
-+++ b/mousepad/mousepad-settings.c
-@@ -298,7 +298,7 @@ void
- mousepad_setting_set_string (const gchar *path,
- const gchar *value)
- {
-- mousepad_setting_set (path, "s", value);
-+ mousepad_setting_set (path, "s", value != NULL ? value : "");
- }
-
-
-diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
-index 8c3eba6..bd0e37c 100644
---- a/mousepad/mousepad-view.c
-+++ b/mousepad/mousepad-view.c
-@@ -257,7 +257,8 @@ mousepad_view_buffer_changed (MousepadView *view,
- GtkSourceStyleScheme *scheme;
-
- manager = gtk_source_style_scheme_manager_get_default ();
-- scheme = gtk_source_style_scheme_manager_get_scheme (manager, view->color_scheme);
-+ scheme = gtk_source_style_scheme_manager_get_scheme (manager,
-+ view->color_scheme ? view->color_scheme : "");
- gtk_source_buffer_set_style_scheme (buffer, scheme);
-
- gtk_source_buffer_set_highlight_matching_brackets (buffer, view->match_braces);
-diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
-index f1acc2b..adae7cd 100644
---- a/mousepad/mousepad-window.c
-+++ b/mousepad/mousepad-window.c
-@@ -717,12 +717,13 @@ mousepad_window_action_group_style_scheme_changed (MousepadWindow *window,
- MousepadActionGroup *group)
- {
- GtkSourceStyleScheme *scheme;
-- const gchar *scheme_id;
-+ const gchar *scheme_id = NULL;
- gint npages, i;
-
- /* get the new active language */
- scheme = mousepad_action_group_get_active_style_scheme (group);
-- scheme_id = gtk_source_style_scheme_get_id (scheme);
-+ if (scheme != NULL)
-+ scheme_id = gtk_source_style_scheme_get_id (scheme);
-
- /* update the color scheme on all the documents */
- npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->notebook));
---
-cgit v0.10.1
-