* [gentoo-commits] repo/gentoo:master commit in: profiles/, app-editors/amyedit/, app-editors/amyedit/files/
@ 2021-06-14 8:25 Andreas Sturmlechner
0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2021-06-14 8:25 UTC (permalink / raw
To: gentoo-commits
commit: 553d7160a8ff28780dd13631170031d94dc3c6a3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 07:57:39 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 08:25:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553d7160
app-editors/amyedit: Remove last-rited package
Bug: https://bugs.gentoo.org/770898
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-editors/amyedit/Manifest | 1 -
app-editors/amyedit/amyedit-1.0-r3.ebuild | 33 --
app-editors/amyedit/files/amyedit-1.0-gcc45.patch | 16 -
.../amyedit/files/amyedit-1.0-keyfile.patch | 62 ----
app-editors/amyedit/files/amyedit-1.0-signal.patch | 86 ------
.../amyedit/files/amyedit-1.0-sourceviewmm2.patch | 331 ---------------------
app-editors/amyedit/metadata.xml | 11 -
profiles/package.mask | 5 -
8 files changed, 545 deletions(-)
diff --git a/app-editors/amyedit/Manifest b/app-editors/amyedit/Manifest
deleted file mode 100644
index 82fb1ac0813..00000000000
--- a/app-editors/amyedit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST amyedit-1.0.tar.bz2 297769 BLAKE2B 9b3640db7f56bc6e5481b46f760e682cedc860e9439a55edcd45b9f1ec0a8dbead3f8f1075c2613da9842a590b56375fde8b3d36c98c813d400960a4d98fdbda SHA512 dce101c5d356cd194703798002c29772b7b7339a97f683ba7459e983988f26722f800a2c36a0c36bdea70a35c8398bc55b5215b4c30779ca22b5f25bbfedbe09
diff --git a/app-editors/amyedit/amyedit-1.0-r3.ebuild b/app-editors/amyedit/amyedit-1.0-r3.ebuild
deleted file mode 100644
index eefaf494464..00000000000
--- a/app-editors/amyedit/amyedit-1.0-r3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools epatch flag-o-matic
-
-DESCRIPTION=" AmyEdit is a LaTeX editor"
-HOMEPAGE="http://amyedit.sf.net"
-SRC_URI="mirror://sourceforge/amyedit/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-RDEPEND=">=dev-cpp/gtkmm-2.6:2.4
- >=dev-cpp/glibmm-2.14:2
- >=dev-libs/libsigc++-2.2:2
- x11-libs/gtksourceview:2.0
- dev-cpp/gtksourceviewmm:2.0
- app-text/aspell"
-DEPEND="${RDEPEND}
- dev-util/intltool
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-keyfile.patch"
- epatch "${FILESDIR}/${P}-signal.patch"
- epatch "${FILESDIR}/${P}-gcc45.patch"
- epatch "${FILESDIR}/${P}-sourceviewmm2.patch"
- rm -rf "${S}/src/gtksourceviewmm" || die
- append-cxxflags -std=c++11
- mv configure.in configure.ac || die
- eautoreconf
-}
diff --git a/app-editors/amyedit/files/amyedit-1.0-gcc45.patch b/app-editors/amyedit/files/amyedit-1.0-gcc45.patch
deleted file mode 100644
index 16db9fd415f..00000000000
--- a/app-editors/amyedit/files/amyedit-1.0-gcc45.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix build with gcc 4.5
-https://bugs.gentoo.org/show_bug.cgi?id=321293
-
-Index: amyedit-1.0/src/Preferences.cc
-===================================================================
---- amyedit-1.0.orig/src/Preferences.cc
-+++ amyedit-1.0/src/Preferences.cc
-@@ -211,7 +211,7 @@ int Preferences::run()
- }
-
- void Preferences::edit_latex_commands(){
-- EditLatexCommands::EditLatexCommands dialog(this);
-+ EditLatexCommands dialog(this);
- dialog.run();
- Amy::populate_text_list_model_from_list(previewoptionslist->get_model(), PrefStruct::instance()->get_keys("Commands"), true);
- previewoptionslist->select(PrefStruct::instance()->get<Glib::ustring>("General", "preview_combo"));
diff --git a/app-editors/amyedit/files/amyedit-1.0-keyfile.patch b/app-editors/amyedit/files/amyedit-1.0-keyfile.patch
deleted file mode 100644
index fb9f9ac908f..00000000000
--- a/app-editors/amyedit/files/amyedit-1.0-keyfile.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ur amyedit-1.0/src/main.cc amyedit-1.0.new/src/main.cc
---- amyedit-1.0/src/main.cc 2006-03-14 06:08:32.000000000 +0700
-+++ amyedit-1.0.new/src/main.cc 2008-01-07 20:45:39.000000000 +0700
-@@ -54,7 +54,6 @@
-
- #include "AmyEdit.hh"
- #include "gtksourceviewmm/init.hh"
--#include "gtkmm_extra/keyfile.h"
- #include "Utils.hh"
-
- int main(int argc, char **argv)
-@@ -65,7 +64,6 @@
-
- Gtk::Main m(&argc, &argv);
- Gtk::SourceViewmm_init();
-- Glib::keyfile_init();
-
- /* TODO This should probably be removed and created on demand */
-
-Only in amyedit-1.0.new/src: main.o
-Only in amyedit-1.0.new/src: Makefile
-diff -ur amyedit-1.0/src/Makefile.am amyedit-1.0.new/src/Makefile.am
---- amyedit-1.0/src/Makefile.am 2006-03-08 05:44:53.000000000 +0700
-+++ amyedit-1.0.new/src/Makefile.am 2008-01-07 20:41:46.000000000 +0700
-@@ -30,8 +30,7 @@
- gtksourceviewmm/sourcelanguage.cpp \
- gtksourceviewmm/sourcelanguagesmanager.cpp \
- gtksourceviewmm/sourceview.cpp \
-- gtksourceviewmm/init.cc \
-- gtkmm_extra/keyfile.cc
-+ gtksourceviewmm/init.cc
-
- headers = \
- AboutDialog.hh \
-@@ -54,15 +53,13 @@
- gtksourceviewmm/sourcelanguage.h \
- gtksourceviewmm/sourcelanguagesmanager.h \
- gtksourceviewmm/sourceview.h \
-- gtksourceviewmm/init.hh \
-- gtkmm_extra/keyfile.h
-+ gtksourceviewmm/init.hh
-
- privateheaders= \
- gtksourceviewmm/private/sourcebuffer_p.h \
- gtksourceviewmm/private/sourcelanguage_p.h \
- gtksourceviewmm/private/sourcelanguagesmanager_p.h \
- gtksourceviewmm/private/sourceview_p.h \
-- gtkmm_extra/private/keyfile_p.h \
- Utils_p.hh
-
- if PRECOMPILE_HEADERS
-diff -ur amyedit-1.0/src/PrefStruct.hh amyedit-1.0.new/src/PrefStruct.hh
---- amyedit-1.0/src/PrefStruct.hh 2006-03-09 06:54:41.000000000 +0700
-+++ amyedit-1.0.new/src/PrefStruct.hh 2008-01-07 20:46:32.000000000 +0700
-@@ -24,7 +24,6 @@
-
- #include "Preferences.hh"
- #include <glibmm/ustring.h>
--#include <gtkmm_extra/keyfile.h>
- #include <iostream>
-
- class PrefStruct
diff --git a/app-editors/amyedit/files/amyedit-1.0-signal.patch b/app-editors/amyedit/files/amyedit-1.0-signal.patch
deleted file mode 100644
index d0f4df521cb..00000000000
--- a/app-editors/amyedit/files/amyedit-1.0-signal.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Naur amyeditbroken/src/AmyEdit.cc amyedit-1.0/src/AmyEdit.cc
---- amyeditbroken/src/AmyEdit.cc 2006-03-13 22:13:08.000000000 +0100
-+++ amyedit-1.0/src/AmyEdit.cc 2008-07-12 05:07:43.965608312 +0200
-@@ -65,9 +65,9 @@
-
- /* My Signals */
- // signals when there is a file available
--SigC::Signal1<void,bool> signal_file_open;
-+sigc::signal1<void,bool> signal_file_open;
- // signals an update to preferences
--SigC::Signal0<void> signal_preferences_update;
-+sigc::signal0<void> signal_preferences_update;
- /**************/
-
- AmyEdit* AmyEdit::smInstance=NULL;
-diff -Naur amyeditbroken/src/EditTabs.cc amyedit-1.0/src/EditTabs.cc
---- amyeditbroken/src/EditTabs.cc 2006-03-13 22:25:53.000000000 +0100
-+++ amyedit-1.0/src/EditTabs.cc 2008-07-12 05:08:41.022094749 +0200
-@@ -76,7 +76,7 @@
- set_tab_pos(Gtk::POS_TOP);
- set_scrollable(true);
-
-- extern SigC::Signal0<void> signal_preferences_update;
-+ extern sigc::signal0<void> signal_preferences_update;
-
- signal_switch_page().connect(sigc::mem_fun(*this, &EditTabs::on_switching_page));
- signal_preferences_update.connect(sigc::mem_fun(*this, &EditTabs::on_preferences_update));
-@@ -414,7 +414,7 @@
-
- bool EditTabs::CloseTab(int tab)
- {
-- extern SigC::Signal1<void,bool> signal_file_open;
-+ extern sigc::signal1<void,bool> signal_file_open;
-
- if (tab<0)
- tab=get_current_page();
-@@ -686,8 +686,8 @@
-
- void EditTabs::on_switching_page(GtkNotebookPage *page, guint number)
- {
-- extern SigC::Signal1<void, int> signal_line_set;
-- extern SigC::Signal1<void, bool> signal_file_open;
-+ extern sigc::signal1<void, int> signal_line_set;
-+ extern sigc::signal1<void, bool> signal_file_open;
- Page *curtab = get_current_tab();
-
- if (curtab)
-@@ -735,7 +735,7 @@
-
- on_preferences_update();
-
-- extern SigC::Signal0<void> signal_preferences_update;
-+ extern sigc::signal0<void> signal_preferences_update;
- get_buffer()->signal_modified_changed().connect(sigc::mem_fun(*this, &EditTabs::Page::on_modified_changed));
- get_buffer()->signal_changed().connect(sigc::mem_fun(*this, &EditTabs::Page::on_changed));
- get_buffer()->signal_mark_set().connect(sigc::mem_fun(*this, &EditTabs::Page::on_mark_changed));
-@@ -815,7 +815,7 @@
-
- void EditTabs::Page::on_changed()
- {
-- extern SigC::Signal1<void, int> signal_line_set;
-+ extern sigc::signal1<void, int> signal_line_set;
- signal_line_set(get_buffer()->get_insert()->get_iter().get_line());
-
- }
-@@ -823,7 +823,7 @@
- void EditTabs::Page::on_mark_changed(Gtk::SourceBuffer::iterator iter, Glib::RefPtr<Gtk::SourceBuffer::Mark> mark){
- if (mark->get_name()=="insert")
- {
-- extern SigC::Signal1<void, int> signal_line_set;
-+ extern sigc::signal1<void, int> signal_line_set;
-
- signal_line_set(get_buffer()->get_insert()->get_iter().get_line());
-
-diff -Naur amyeditbroken/src/StatusBar.cc amyedit-1.0/src/StatusBar.cc
---- amyeditbroken/src/StatusBar.cc 2005-12-17 15:56:47.000000000 +0100
-+++ amyedit-1.0/src/StatusBar.cc 2008-07-12 05:09:14.020602906 +0200
-@@ -50,7 +50,7 @@
- #include "StatusBar.hh"
- #include "Utils.hh"
-
--SigC::Signal1<void, int> signal_line_set;
-+sigc::signal1<void, int> signal_line_set;
-
- StatusBar::StatusBar()
- {
diff --git a/app-editors/amyedit/files/amyedit-1.0-sourceviewmm2.patch b/app-editors/amyedit/files/amyedit-1.0-sourceviewmm2.patch
deleted file mode 100644
index 31b7882b3ba..00000000000
--- a/app-editors/amyedit/files/amyedit-1.0-sourceviewmm2.patch
+++ /dev/null
@@ -1,331 +0,0 @@
-Index: amyedit-1.0/configure.in
-===================================================================
---- amyedit-1.0.orig/configure.in
-+++ amyedit-1.0/configure.in
-@@ -36,7 +36,7 @@ AC_ARG_ENABLE(precompiled-headers,
- AM_CONDITIONAL(PRECOMPILE_HEADERS, test x$enable_precompiled_headers = xyes)
-
- AC_CHECK_LIB([aspell], [new_aspell_config])
--PKG_CHECK_MODULES(AMYEDIT, gtkmm-2.4 >= 2.6 gtksourceview-1.0)
-+PKG_CHECK_MODULES(AMYEDIT, gtkmm-2.4 >= 2.6 gtksourceview-2.0 gtksourceviewmm-2.0)
- AC_SUBST(AMYEDIT_CFLAGS)
- AC_SUBST(AMYEDIT_LIBS)
-
-Index: amyedit-1.0/src/Makefile.am
-===================================================================
---- amyedit-1.0.orig/src/Makefile.am
-+++ amyedit-1.0/src/Makefile.am
-@@ -25,12 +25,7 @@ sources = \
- TextListViewComboBox.cc \
- TextListViewListBox.cc \
- Utils.cc \
-- main.cc \
-- gtksourceviewmm/sourcebuffer.cpp \
-- gtksourceviewmm/sourcelanguage.cpp \
-- gtksourceviewmm/sourcelanguagesmanager.cpp \
-- gtksourceviewmm/sourceview.cpp \
-- gtksourceviewmm/init.cc
-+ main.cc
-
- headers = \
- AboutDialog.hh \
-@@ -48,18 +43,9 @@ headers = \
- TextListModel.hh \
- TextListViewComboBox.hh \
- TextListViewListBox.hh \
-- Utils.hh \
-- gtksourceviewmm/sourcebuffer.h \
-- gtksourceviewmm/sourcelanguage.h \
-- gtksourceviewmm/sourcelanguagesmanager.h \
-- gtksourceviewmm/sourceview.h \
-- gtksourceviewmm/init.hh
-+ Utils.hh
-
- privateheaders= \
-- gtksourceviewmm/private/sourcebuffer_p.h \
-- gtksourceviewmm/private/sourcelanguage_p.h \
-- gtksourceviewmm/private/sourcelanguagesmanager_p.h \
-- gtksourceviewmm/private/sourceview_p.h \
- Utils_p.hh
-
- if PRECOMPILE_HEADERS
-Index: amyedit-1.0/src/EditTabs.cc
-===================================================================
---- amyedit-1.0.orig/src/EditTabs.cc
-+++ amyedit-1.0/src/EditTabs.cc
-@@ -57,8 +57,8 @@ Foundation, Inc., 59 Temple Place, Suite
-
- #include <gtksourceview/gtksourcebuffer.h>
- #include <gtksourceviewmm/sourcelanguage.h>
--#include <gtksourceviewmm/sourcelanguagesmanager.h>
--#include <gtksourceview/gtksourcelanguagesmanager.h>
-+#include <gtksourceviewmm/sourcelanguagemanager.h>
-+#include <gtksourceview/gtksourcelanguagemanager.h>
- #include <gtksourceview/gtksourceiter.h>
-
- #include <gtkmm/stock.h>
-@@ -161,7 +161,7 @@ void EditTabs::OpenTab(Glib::ustring fil
- {
- try
- {
-- Glib::RefPtr<Gtk::SourceBuffer> buffer = is_buffer_open(filename);
-+ Glib::RefPtr<gtksourceview::SourceBuffer> buffer = is_buffer_open(filename);
- Page *newpage;
-
- if (buffer){
-@@ -553,16 +553,15 @@ Glib::ustring EditTabs::GetUntitledTabNa
-
- void EditTabs::Undo()
- {
-- Glib::RefPtr<Gtk::SourceBuffer> buffer = get_current_view()->get_buffer();
-+ Glib::RefPtr<gtksourceview::SourceBuffer> buffer = Glib::RefPtr<gtksourceview::SourceBuffer>::cast_static(get_current_view()->get_buffer());
- if (buffer->can_undo ())
- buffer->undo ();
-
- }
-
--
- void EditTabs::Redo()
- {
-- Glib::RefPtr<Gtk::SourceBuffer> buffer = get_current_view()->get_buffer();
-+ Glib::RefPtr<gtksourceview::SourceBuffer> buffer = Glib::RefPtr<gtksourceview::SourceBuffer>::cast_static(get_current_view()->get_buffer());
- if (buffer->can_redo ())
- buffer->redo ();
-
-@@ -625,10 +624,10 @@ void EditTabs::FindNext()
- Page *curtab = get_current_tab();
- if (curtab)
- {
-- Glib::RefPtr<Gtk::SourceBuffer::Mark> cursor=curtab->get_buffer()->get_insert();
-- Gtk::SourceBuffer::iterator start, end;
-+ Glib::RefPtr<gtksourceview::SourceBuffer::Mark> cursor=curtab->get_buffer()->get_insert();
-+ gtksourceview::SourceBuffer::iterator start, end;
- GtkTextIter climit;
-- Gtk::SourceBuffer::iterator limit(&climit);
-+ gtksourceview::SourceBuffer::iterator limit(&climit);
- FindDialog fdialog;
- int result;
- do
-@@ -648,7 +647,7 @@ void EditTabs::FindNext()
- if(gtk_source_iter_forward_search(cursor->get_iter().gobj(),fdialog.get_text().c_str(),fdialog.get_flags(),start.gobj(),end.gobj(),0))
- {
- curtab->get_buffer()->select_range(end, start);
-- (static_cast<Gtk::SourceView*>(curtab->get_child()))->scroll_to(end);
-+ (static_cast<gtksourceview::SourceView*>(curtab->get_child()))->scroll_to(end);
- }
- else
- {
-@@ -701,7 +700,7 @@ void EditTabs::on_switching_page(GtkNote
-
- }
-
--Glib::RefPtr <Gtk::SourceBuffer> EditTabs::is_buffer_open(Glib::ustring filename){
-+Glib::RefPtr <gtksourceview::SourceBuffer> EditTabs::is_buffer_open(Glib::ustring filename){
- int p = get_n_pages();
-
- for (int x=0;x<p;x++){
-@@ -711,19 +710,19 @@ Glib::RefPtr <Gtk::SourceBuffer> EditTab
- return curtab->get_buffer();
- }
-
-- return Glib::RefPtr <Gtk::SourceBuffer> (NULL);
-+ return Glib::RefPtr <gtksourceview::SourceBuffer> (NULL);
-
-
- }
-
--EditTabs::Page::Page(EditTabs *parent, Glib::RefPtr<Gtk::SourceBuffer> buffer){
-+EditTabs::Page::Page(EditTabs *parent, Glib::RefPtr<gtksourceview::SourceBuffer> buffer){
-
- /* Note to self! CLEAN THIS UP!!!! */
-
- /* Page is actually a ScrollWindow thing */
- set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
-
-- Gtk::SourceView *sourceview=Gtk::manage(new Gtk::SourceView());
-+ gtksourceview::SourceView *sourceview=Gtk::manage(new gtksourceview::SourceView());
-
- if (buffer)
- sourceview->set_buffer(buffer);
-@@ -750,10 +749,10 @@ EditTabs::Page::Page(EditTabs *parent, G
- * (ie buffer is null) */
-
- if (!buffer){
-- Glib::ustring mime_type("text/x-tex");
-+ Glib::ustring mime_type("latex");
-
-- Glib::RefPtr<Gtk::SourceLanguagesManager> lm = buffer->get_languages_manager();
-- Glib::RefPtr<Gtk::SourceLanguage> language = lm->get_language_from_mime_type(mime_type);
-+ Glib::RefPtr<gtksourceview::SourceLanguageManager> lm = gtksourceview::SourceLanguageManager::create();
-+ Glib::RefPtr<gtksourceview::SourceLanguage> language = lm->get_language(mime_type);
-
-
- if (language)
-@@ -820,7 +819,7 @@ void EditTabs::Page::on_changed()
-
- }
-
--void EditTabs::Page::on_mark_changed(Gtk::SourceBuffer::iterator iter, Glib::RefPtr<Gtk::SourceBuffer::Mark> mark){
-+void EditTabs::Page::on_mark_changed(gtksourceview::SourceBuffer::iterator iter, Glib::RefPtr<gtksourceview::SourceBuffer::Mark> mark){
- if (mark->get_name()=="insert")
- {
- extern sigc::signal1<void, int> signal_line_set;
-@@ -835,14 +834,14 @@ EditTabs *EditTabs::Page::get_parent()
- return (static_cast<EditTabs*>(Gtk::Widget::get_parent()));
- }
-
--Gtk::SourceView* EditTabs::Page::get_child()
-+gtksourceview::SourceView* EditTabs::Page::get_child()
- {
-- return (static_cast<Gtk::SourceView*>(Gtk::Bin::get_child()));
-+ return (static_cast<gtksourceview::SourceView*>(Gtk::Bin::get_child()));
- }
-
--Glib::RefPtr<Gtk::SourceBuffer> EditTabs::Page::get_buffer()
-+Glib::RefPtr<gtksourceview::SourceBuffer> EditTabs::Page::get_buffer()
- {
-- return (get_child()->get_buffer());
-+ return Glib::RefPtr<gtksourceview::SourceBuffer>::cast_static(get_child()->get_buffer());
- }
-
- EditTabs::Page *EditTabs::get_current_tab()
-@@ -850,9 +849,9 @@ EditTabs::Page *EditTabs::get_current_ta
- return (static_cast<EditTabs::Page*>(get_nth_page(get_current_page())));
- }
-
--Gtk::SourceView *EditTabs::get_current_view()
-+gtksourceview::SourceView *EditTabs::get_current_view()
- {
-- return (static_cast<Gtk::SourceView*>(get_current_tab()->get_child()));
-+ return (static_cast<gtksourceview::SourceView*>(get_current_tab()->get_child()));
- }
-
-
-@@ -861,8 +860,8 @@ void EditTabs::Page::on_preferences_upda
- // For things that need to happen for all pages
- PrefStruct *prefs = PrefStruct::instance();
-
-- get_child()->set_tabs_width(prefs->get<int>("General", "tab_size"));
-- get_buffer()->set_highlight(prefs->get<bool>("General", "syntax_highlighting"));
-+ get_child()->set_tab_width(prefs->get<int>("General", "tab_size"));
-+ get_buffer()->set_highlight_syntax(prefs->get<bool>("General", "syntax_highlighting"));
-
- }
-
-Index: amyedit-1.0/src/EditTabs.hh
-===================================================================
---- amyedit-1.0.orig/src/EditTabs.hh
-+++ amyedit-1.0/src/EditTabs.hh
-@@ -63,11 +63,11 @@ class EditTabs: public Gtk::Notebook
- class Page:public Gtk::ScrolledWindow
- {
- public:
-- Page(EditTabs *parent, Glib::RefPtr<Gtk::SourceBuffer> buffer=Glib::RefPtr<Gtk::SourceBuffer>());
-+ Page(EditTabs *parent, Glib::RefPtr<gtksourceview::SourceBuffer> buffer=Glib::RefPtr<gtksourceview::SourceBuffer>());
-
- EditTabs *get_parent();
-- Gtk::SourceView *get_child();
-- Glib::RefPtr<Gtk::SourceBuffer> get_buffer();
-+ gtksourceview::SourceView *get_child();
-+ Glib::RefPtr<gtksourceview::SourceBuffer> get_buffer();
-
- Glib::ustring filename;
- Gtk::Label *tablabel;
-@@ -77,8 +77,8 @@ class EditTabs: public Gtk::Notebook
- void on_close_me();
- void on_modified_changed();
- void on_changed();
-- void on_mark_changed(Gtk::SourceBuffer::iterator iter,
-- Glib::RefPtr<Gtk::SourceBuffer::Mark> mark);
-+ void on_mark_changed(gtksourceview::SourceBuffer::iterator iter,
-+ Glib::RefPtr<gtksourceview::SourceBuffer::Mark> mark);
- void on_preferences_update();
-
- };
-@@ -89,13 +89,13 @@ class EditTabs: public Gtk::Notebook
- Glib::ustring GetRootFileName();
- Glib::ustring TabNameFromFile(Glib::ustring start);
- Glib::ustring GetUntitledTabName(Glib::ustring start);
-- Glib::RefPtr<Gtk::SourceBuffer> is_buffer_open(Glib::ustring filename);
-+ Glib::RefPtr<gtksourceview::SourceBuffer> is_buffer_open(Glib::ustring filename);
-
- void on_switching_page(GtkNotebookPage *page, guint number);
- public:
- Page *get_current_tab();
- private:
-- Gtk::SourceView *get_current_view();
-+ gtksourceview::SourceView *get_current_view();
-
- void on_preferences_update();
-
-Index: amyedit-1.0/src/SpellDialog.cc
-===================================================================
---- amyedit-1.0.orig/src/SpellDialog.cc
-+++ amyedit-1.0/src/SpellDialog.cc
-@@ -267,9 +267,9 @@ int SpellDialog::checkDocument(){
- aspell_document_checker_reset(checker);
-
- view = getCurrentPage()->get_child();
-- buffer = view->get_buffer();
-+ buffer = Glib::RefPtr<gtksourceview::SourceBuffer>::cast_static(view->get_buffer());
-
-- buffer->set_check_brackets(false);
-+ buffer->set_highlight_matching_brackets(false);
-
- /* areastart has left gravity, arearight has right gravity, as inserts only
- * occur inside them, they should always mark the beginning and ends of the
-@@ -315,7 +315,7 @@ int SpellDialog::checkDocument(){
- buffer->delete_mark(areastart);
- buffer->delete_mark(areaend);
-
-- buffer->set_check_brackets(true);
-+ buffer->set_highlight_matching_brackets(true);
- return 0;
- }
-
-@@ -370,7 +370,7 @@ bool SpellDialog::changeWord(AspellToken
- /* Close Clicked */
-
- buffer->place_cursor(wordend);
-- buffer->set_check_brackets();
-+ buffer->set_highlight_matching_brackets();
- return false;
- }
-
-Index: amyedit-1.0/src/SpellDialog.hh
-===================================================================
---- amyedit-1.0.orig/src/SpellDialog.hh
-+++ amyedit-1.0/src/SpellDialog.hh
-@@ -49,8 +49,8 @@ class SpellDialog : public Gtk::Dialog,
-
- void on_preferences_update();
-
-- Gtk::SourceView* view;
-- Glib::RefPtr<Gtk::SourceBuffer> buffer;
-+ gtksourceview::SourceView* view;
-+ Glib::RefPtr<gtksourceview::SourceBuffer> buffer;
- Gtk::Entry misslabel;
- Gtk::Entry replaceentry;
- TextListViewListBox listbox;
-Index: amyedit-1.0/src/main.cc
-===================================================================
---- amyedit-1.0.orig/src/main.cc
-+++ amyedit-1.0/src/main.cc
-@@ -53,7 +53,7 @@
- #include <fstream>
-
- #include "AmyEdit.hh"
--#include "gtksourceviewmm/init.hh"
-+#include "gtksourceviewmm/init.h"
- #include "Utils.hh"
-
- int main(int argc, char **argv)
-@@ -63,7 +63,7 @@ int main(int argc, char **argv)
- textdomain (GETTEXT_PACKAGE);
-
- Gtk::Main m(&argc, &argv);
-- Gtk::SourceViewmm_init();
-+ gtksourceview::init();
-
- /* TODO This should probably be removed and created on demand */
-
diff --git a/app-editors/amyedit/metadata.xml b/app-editors/amyedit/metadata.xml
deleted file mode 100644
index 130606723ad..00000000000
--- a/app-editors/amyedit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>tex@gentoo.org</email>
- <name>Gentoo TeX Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">amyedit</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 38f1a451915..27b6d576449 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -337,11 +337,6 @@ dev-java/freemarker
# to a freshed gcc branch.
<sys-devel/gcc-7
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-05-15)
-# Dead upstream, dead downstream, GTK+2 based. Bug #770898
-# Removal on 2021-06-14.
-app-editors/amyedit
-
# Michał Górny <mgorny@gentoo.org> (2021-05-15)
# Relies on dev-python/astunparse that is broken with Python 3.8+
# and abandoned upstream. The current version is also broken
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-14 8:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-14 8:25 [gentoo-commits] repo/gentoo:master commit in: profiles/, app-editors/amyedit/, app-editors/amyedit/files/ Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox