diff --git a/helpers/make-abiword b/helpers/make-abiword deleted file mode 100644 index 8bca84a62ebab5bf2cf2304d3dba00ef7f144562..0000000000000000000000000000000000000000 --- a/helpers/make-abiword +++ /dev/null @@ -1,172 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2018 Ruben Rodriguez <ruben@trisquel.info> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 - -. ./config - -# Patch from https://bugzilla.abisource.com/show_bug.cgi?id=13791 -# Removed first chunk, as it doesn't apply to our version -cat << EOF | patch -p1 -From 46388f407c893123d9b3824a7570b050fc3b049b Mon Sep 17 00:00:00 2001 -From: James Cameron <quozl@laptop.org> -Date: Thu, 17 Aug 2017 15:05:39 +1000 -Subject: [PATCH] Fix flickering -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- in GR_Caret::s_blink_timeout, avoid repeated calls by stopping the - timer, it will be restarted when needed, - -- in GR_Caret::s_enable, avoid extra unnecessary _blink calls when blink - is enabled, as they serve no purpose, - -- in XAP_UnixFrameImpl::_fe::expose, use the Cairo clip rectangle - instead of the expose event area, thanks to Hubert Figuière in - 865c1dda7e13deff04573ffc42028b71fee07f9c, - -- in XAP_UnixFrameImpl::_fe::expose, do not return FALSE, as other - handlers will need to handle the draw event, - -- in GR_UnixCairoGraphics::flush, fix excessive draw events; - gtk_widget_queue_draw only marks the widget as needing redrawing, - which causes a draw event for each call to flush, therefore every - caret blink, so use gdk_flush instead, - -Fixes AbiSource #13791. -Fixes Debian #851052. -Fixes Fedora #1287835. -Fixes Ubuntu LP: #1574278. -Fixes Sugar Labs #4915. - -Signed-off-by: James Cameron <quozl@laptop.org> - -diff --git a/src/af/gr/xp/gr_Caret.cpp b/src/af/gr/xp/gr_Caret.cpp -index 5d5d116..a8aa451 100644 ---- a/src/af/gr/xp/gr_Caret.cpp -+++ b/src/af/gr/xp/gr_Caret.cpp -@@ -155,22 +155,17 @@ void GR_Caret::s_enable(UT_Worker * _w) - { - GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData()); - -+ c->m_enabler->stop(); - c->m_worker->stop(); -- c->_blink(true); -- if (!c->m_bCursorIsOn) -- c->_blink(true); // blink again -- else -- { -- c->_blink(true); // ?? - MARCM -- c->_blink(true); -- } - c->m_worker->start(); -- c->m_enabler->stop(); -+ c->_blink(true); - } - - void GR_Caret::s_blink_timeout(UT_Worker * _w) - { - GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData()); -+ -+ c->m_blinkTimeout->stop(); - if (c->isEnabled()) - c->disable(); - } -diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -index 780000e..e81961a 100644 ---- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g - } - - #if GTK_CHECK_VERSION(3,0,0) --gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) -+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) - #else - gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) - #endif - { - XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data")); - FV_View * pView = static_cast<FV_View *>(pUnixFrameImpl->getFrame()->getCurrentView()); -+ double x, y, width, height; - #if GTK_CHECK_VERSION(3,0,0) -- GdkEventExpose *pExposeEvent = reinterpret_cast<GdkEventExpose *>(gtk_get_current_event()); -+ cairo_clip_extents (cr, &x, &y, &width, &height); -+ width -= x; -+ height -= y; -+#else -+ x = pExposeEvent->area.x; -+ y = pExposeEvent->area.y; -+ width = pExposeEvent->area.width; -+ height = pExposeEvent->area.height; - #endif - /* Jean: commenting out next lines since the zoom update code does draw only - * part of what needs to be updated. */ -@@ -1230,20 +1238,21 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) - UT_Rect rClip; - if (pGr->getPaintCount () > 0) - return TRUE; -- xxx_UT_DEBUGMSG(("Expose area: x %d y %d width %d height %d \n",pExposeEvent->area.x,pExposeEvent->area.y,pExposeEvent->area.width,pExposeEvent->area.height)); -- rClip.left = pGr->tlu(pExposeEvent->area.x); -- rClip.top = pGr->tlu(pExposeEvent->area.y); -- rClip.width = pGr->tlu(pExposeEvent->area.width)+1; -- rClip.height = pGr->tlu(pExposeEvent->area.height)+1; --#if GTK_CHECK_VERSION(3,0,0) -+ rClip.left = pGr->tlu(x); -+ rClip.top = pGr->tlu(y); -+ #if GTK_CHECK_VERSION(3,0,0) -+ rClip.width = pGr->tlu(width); -+ rClip.height = pGr->tlu(height); - static_cast<GR_CairoGraphics *>(pGr)->setCairo(cr); - pView->draw(&rClip); - static_cast<GR_CairoGraphics *>(pGr)->setCairo(NULL); - #else -+ rClip.width = pGr->tlu(width)+1; -+ rClip.height = pGr->tlu(height)+1; - pView->draw(&rClip); - #endif - } -- return FALSE; -+ return TRUE; - } - - static bool bScrollWait = false; -diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h -index 30ee5d8..26fbb2e 100644 ---- a/src/af/xap/gtk/xap_UnixFrameImpl.h -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h -@@ -152,7 +152,7 @@ protected: - static gint key_release_event(GtkWidget* w, GdkEventKey* e); - static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); - #if GTK_CHECK_VERSION(3,0,0) -- static gint draw(GtkWidget * w, cairo_t * cr); -+ static gboolean draw(GtkWidget * w, cairo_t * cr); - #else - static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); - #endif --- -2.11.0 -EOF - - -changelog "Backported into Trisquel" - -compile - diff --git a/helpers/make-dasher b/helpers/make-dasher deleted file mode 100644 index 2e33f81d8cf10a49a299282b655bde61d0b3458e..0000000000000000000000000000000000000000 --- a/helpers/make-dasher +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2014 Rubén RodrÃguez <ruben@trisquel.info> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -LOCALDEPENDS=true - -. ./config - -sed '/speech/d' -i debian/rules debian/control - -changelog "Remove dependence on gnome-speech, which was removed as per #2338" - -compile - diff --git a/helpers/make-db b/helpers/make-db deleted file mode 100644 index 6df8f93f0cf94e7c9c9f487769abee59bf0c3199..0000000000000000000000000000000000000000 --- a/helpers/make-db +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2013 Rubén RodrÃguez <ruben@trisquel.info> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -COMPONENT=main -QUILT=skip -. ./config - -# This file is distributed from upstream Berkeley DB under the Artistic -# License (no version specified), althouth it was later released by the -# original author under both GPL2+ and BSD. -# . -# References: -# http://web.archive.org/web/20010806225716/http://www.math.keio.ac.jp/matumoto/mt19937int.c -# http://web.archive.org/web/20130127064020/http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c -# https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=886838 -# https://lists.nongnu.org/archive/html/gnu-linux-libre/2010-05/msg00000.html - -cp $DATA/007-mt19937db.c_license.patch debian/patches -echo 007-mt19937db.c_license.patch >> debian/patches/series - -export QUILT_PATCHES=debian/patches -quilt push -a - -changelog "Update license to include GPL, fixes 5954" - -compile - diff --git a/helpers/make-file-roller b/helpers/make-file-roller deleted file mode 100644 index 6e2cdcdc4e773b93c8cf6ecceeb4aedca9671788..0000000000000000000000000000000000000000 --- a/helpers/make-file-roller +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2012 Rubén RodrÃguez <ruben@trisquel.info> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=2 -COMPONENT=main -QUILT=skip - -. ./config - -sed 's/--enable-magic/--enable-magic --disable-packagekit/' debian/rules -i -rm debian/patches/01_package_names.patch -sed '/^01_package_names\.patch/d' debian/patches/series -i - -export QUILT_PATCHES=debian/patches -quilt push -a - -changelog "Disabled package recommendations, fixes #7747" - -compile - diff --git a/helpers/make-gnome-control-center b/helpers/make-gnome-control-center deleted file mode 100644 index 341f964b90131d271cae637a0110b0be68433bb7..0000000000000000000000000000000000000000 --- a/helpers/make-gnome-control-center +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2012-2017 Rubén RodrÃguez <ruben@trisquel.info> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -COMPONENT=main - -. ./config - -# Remove recommendeds as it points to ubuntu-docs -sed 's/ | ubuntu-docs//' -i debian/control* - -# Replace logo -replace UbuntuLogo.png TrisquelLogo.png -rm debian/UbuntuLogoBlank.png -cp $DATA/TrisquelLogo.png debian/TrisquelLogoBlank.png -sed 's/ubuntu/trisquel/g; s/Ubuntu/Trisquel/g; s/14.04 LTS/7.0 LTS/' -i debian/rules - -# disable ubuntu branding -for patch in 56_use_ubuntu_info_branding.patch; do - rm ./debian/patches/$patch - sed /$patch/d -i debian/patches/series -done - -# Edit menu selections -cp $DATA/gnomecc.menu.in shell/gnomecc.menu.in - -replace "Trisquel-Gettext" "Ubuntu-Gettext" . - -changelog "Rebranded for Trisquel" - -compile - diff --git a/helpers/make-gnome-panel b/helpers/make-gnome-panel deleted file mode 100644 index 08a5793145ebc61d5ec434ca29490390216a921d..0000000000000000000000000000000000000000 --- a/helpers/make-gnome-panel +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2008-2018 Ruben Rodriguez <ruben@trisquel.info> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 - -. ./config - -# Remove the arrow in the main menu button -sed 's/"tooltip", tooltip,/"tooltip", "Trisquel",/; s/"has-arrow", TRUE,/"has-arrow", FALSE,/' -i gnome-panel/panel-menu-button.c - -# Disable patches related to the gnome sessions -for patch in 41_classic_layout.patch; do - rm debian/patches/$patch - sed /$patch/d -i debian/patches/series -done - -# Custom layout -cat << EOF > data/panel-default-layout.layout -[Toplevel panel] -expand=true -orientation=bottom -size=44 -y-bottom=0 - -[Object menu-bar] -object-iid=PanelInternalFactory::MenuButton -toplevel-id=panel -pack-type=start -pack-index=0 - -[Object home] -object-iid=PanelInternalFactory::Launcher -@instance-config/location="file:///usr/share/applications/home.desktop" -pack-index=10 -pack-type=start -toplevel-id=panel - -[Object abrowser] -object-iid=PanelInternalFactory::Launcher -@instance-config/location="file:///usr/share/applications/browser.desktop" -pack-index=20 -pack-type=start -toplevel-id=panel - -[Object window-list] -object-iid=WnckletFactory::WindowListApplet -pack-index=30 -pack-type=start -toplevel-id=panel - -[Object notification-area] -object-iid=NotificationAreaAppletFactory::NotificationArea -pack-index=11 -pack-type=end -toplevel-id=panel - -[Object indicators] -object-iid=IndicatorAppletFactory::IndicatorApplet -toplevel-id=panel -pack-type=end -pack-index=10 - -[Object show-desktop] -object-iid=WnckletFactory::ShowDesktopApplet -pack-index=0 -pack-type=end -toplevel-id=panel - -EOF - -# We don't want to show the gnome-online-accounts stuff yet -patch -p1 < $DATA/hide-online-accounts-menu.patch - -# Do not require alt or alt+supr key modifiers for showing menus on right click -patch -p1 < $DATA/no-mouse-modifier.patch - -changelog "Changed default layout" - -compile - diff --git a/helpers/make-picard b/helpers/make-picard deleted file mode 100644 index b39a62c9cd22278f6f9f6caed96ebced3d683e7b..0000000000000000000000000000000000000000 --- a/helpers/make-picard +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2015 Andrew M. Lindley <andrew@andrewlindley.co.uk> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 - -. ./config - -sed '/self.plugin_download = QtGui.QPushButton(self.groupBox_2)/a\ - self.plugin_download.setVisible(False) -' -i picard/ui/ui_options_plugins.py - -changelog 'Disable Download Plugin in picard/ui/ui_options_plugins.py #6274' - -compile -