OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

83 lines
3.0 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../amyedit/amyedit-1.0-keyfile.patch
  5. # Copyright (C) 2010 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. Description: Remove private Glib::KeyFile usage as >=glibmm-2.14 provides an alternative
  17. This patch was borrowed from Gentoo Linux:
  18. http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-editors/amyedit/files/amyedit-1.0-keyfile.patch?revision=1.1&view=markup
  19. diff -ur amyedit-1.0/src/main.cc amyedit-1.0.new/src/main.cc
  20. --- amyedit-1.0/src/main.cc 2006-03-14 06:08:32.000000000 +0700
  21. +++ amyedit-1.0.new/src/main.cc 2008-01-07 20:45:39.000000000 +0700
  22. @@ -54,7 +54,6 @@
  23. #include "AmyEdit.hh"
  24. #include "gtksourceviewmm/init.hh"
  25. -#include "gtkmm_extra/keyfile.h"
  26. #include "Utils.hh"
  27. int main(int argc, char **argv)
  28. @@ -65,7 +64,6 @@
  29. Gtk::Main m(&argc, &argv);
  30. Gtk::SourceViewmm_init();
  31. - Glib::keyfile_init();
  32. /* TODO This should probably be removed and created on demand */
  33. Only in amyedit-1.0.new/src: main.o
  34. Only in amyedit-1.0.new/src: Makefile
  35. diff -ur amyedit-1.0/src/Makefile.am amyedit-1.0.new/src/Makefile.am
  36. --- amyedit-1.0/src/Makefile.am 2006-03-08 05:44:53.000000000 +0700
  37. +++ amyedit-1.0.new/src/Makefile.am 2008-01-07 20:41:46.000000000 +0700
  38. @@ -30,8 +30,7 @@
  39. gtksourceviewmm/sourcelanguage.cpp \
  40. gtksourceviewmm/sourcelanguagesmanager.cpp \
  41. gtksourceviewmm/sourceview.cpp \
  42. - gtksourceviewmm/init.cc \
  43. - gtkmm_extra/keyfile.cc
  44. + gtksourceviewmm/init.cc
  45. headers = \
  46. AboutDialog.hh \
  47. @@ -54,15 +53,13 @@
  48. gtksourceviewmm/sourcelanguage.h \
  49. gtksourceviewmm/sourcelanguagesmanager.h \
  50. gtksourceviewmm/sourceview.h \
  51. - gtksourceviewmm/init.hh \
  52. - gtkmm_extra/keyfile.h
  53. + gtksourceviewmm/init.hh
  54. privateheaders= \
  55. gtksourceviewmm/private/sourcebuffer_p.h \
  56. gtksourceviewmm/private/sourcelanguage_p.h \
  57. gtksourceviewmm/private/sourcelanguagesmanager_p.h \
  58. gtksourceviewmm/private/sourceview_p.h \
  59. - gtkmm_extra/private/keyfile_p.h \
  60. Utils_p.hh
  61. if PRECOMPILE_HEADERS
  62. diff -ur amyedit-1.0/src/PrefStruct.hh amyedit-1.0.new/src/PrefStruct.hh
  63. --- amyedit-1.0/src/PrefStruct.hh 2006-03-09 06:54:41.000000000 +0700
  64. +++ amyedit-1.0.new/src/PrefStruct.hh 2008-01-07 20:46:32.000000000 +0700
  65. @@ -24,7 +24,6 @@
  66. #include "Preferences.hh"
  67. #include <glibmm/ustring.h>
  68. -#include <gtkmm_extra/keyfile.h>
  69. #include <iostream>
  70. class PrefStruct