Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ef90c8e7e17e2c1df924df7ce530b7bc5926c84a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ef90c8e7e17e2c1df924df7ce530b7bc5926c84a)
  • Date: Thu, 13 Jan 2011 04:50:17 -0600

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

dev/null |binary
gnome2-apps/gthumb2/DETAILS | 2 -
gnome2-apps/gthumb2/HISTORY | 4 ++
gnome2-apps/gthumb2/PRE_BUILD | 4 --
gnome2-apps/gthumb2/gthumb-2.12.1.tar.bz2.sig | 0
gnome2-apps/gthumb2/gthumb-2.12.2.tar.bz2.sig |binary
gnome2-apps/gthumb2/gthumb-exiv2.patch | 45
--------------------------
7 files changed, 5 insertions(+), 50 deletions(-)

New commits:
commit ef90c8e7e17e2c1df924df7ce530b7bc5926c84a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gthumb2 2.12.2

diff --git a/gnome2-apps/gthumb2/DETAILS b/gnome2-apps/gthumb2/DETAILS
index 03672a7..8759179 100755
--- a/gnome2-apps/gthumb2/DETAILS
+++ b/gnome2-apps/gthumb2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gthumb2
- VERSION=2.12.1
+ VERSION=2.12.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gthumb-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gthumb-$VERSION
diff --git a/gnome2-apps/gthumb2/HISTORY b/gnome2-apps/gthumb2/HISTORY
index eae2f9c..00af68d 100644
--- a/gnome2-apps/gthumb2/HISTORY
+++ b/gnome2-apps/gthumb2/HISTORY
@@ -1,3 +1,7 @@
+2011-01-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.12.2
+ * PRE_BUILD, gthumb-exiv2.patch: patch removed, fixed upstream
+
2011-01-07 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: added to apply exiv2 patch until next release
http://bugs.gentoo.org/show_bug.cgi?id=349160
diff --git a/gnome2-apps/gthumb2/PRE_BUILD b/gnome2-apps/gthumb2/PRE_BUILD
deleted file mode 100755
index ea10785..0000000
--- a/gnome2-apps/gthumb2/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-patch -p1 < $SPELL_DIRECTORY/gthumb-exiv2.patch
diff --git a/gnome2-apps/gthumb2/gthumb-2.12.1.tar.bz2.sig
b/gnome2-apps/gthumb2/gthumb-2.12.1.tar.bz2.sig
deleted file mode 100644
index 180a992..0000000
Binary files a/gnome2-apps/gthumb2/gthumb-2.12.1.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/gthumb2/gthumb-2.12.2.tar.bz2.sig
b/gnome2-apps/gthumb2/gthumb-2.12.2.tar.bz2.sig
new file mode 100644
index 0000000..468a4cd
Binary files /dev/null and b/gnome2-apps/gthumb2/gthumb-2.12.2.tar.bz2.sig
differ
diff --git a/gnome2-apps/gthumb2/gthumb-exiv2.patch
b/gnome2-apps/gthumb2/gthumb-exiv2.patch
deleted file mode 100644
index 5bcb206..0000000
--- a/gnome2-apps/gthumb2/gthumb-exiv2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/extensions/exiv2_tools/exiv2-utils.cpp
b/extensions/exiv2_tools/exiv2-utils.cpp
-index 780bf29..f24b50d 100644
---- a/extensions/exiv2_tools/exiv2-utils.cpp
-+++ b/extensions/exiv2_tools/exiv2-utils.cpp
-@@ -497,19 +497,19 @@ set_attributes_from_tagsets (GFileInfo *info)
- static const char *
- get_exif_default_category (const Exiv2::Exifdatum &md)
- {
-+#if EXIV2_TEST_VERSION(0, 21, 0)
-+ if (Exiv2::ExifTags::isMakerGroup(md.groupName()))
-+#else
- if (Exiv2::ExifTags::isMakerIfd(md.ifdId()))
-+#endif
- return "Exif::MakerNotes";
-
-- switch (md.ifdId()) {
-- case Exiv2::ifd1Id:
-+ if (md.groupName().compare("Thumbnail") == 0)
- return "Exif::Thumbnail";
-- case Exiv2::gpsIfdId:
-+ else if (md.groupName().compare("GPSInfo") == 0)
- return "Exif::GPS";
-- case Exiv2::iopIfdId:
-+ else if (md.groupName().compare("Iop") == 0)
- return "Exif::Versions";
-- default:
-- break;
-- }
-
- return "Exif::Other";
- }
-@@ -531,7 +531,11 @@ exiv2_read_metadata (Exiv2::Image::AutoPtr image,
- stringstream description;
- if (! md->tagLabel().empty())
- description << md->tagLabel();
-- else if (md->ifdId () > Exiv2::ifd1Id)
-+#if EXIV2_TEST_VERSION(0, 21, 0)
-+ else if
(Exiv2::ExifTags::isMakerGroup(md->groupName()))
-+#else
-+ else if (Exiv2::ExifTags::isMakerIfd(md->ifdId()))
-+#endif
- // Must be a MakerNote - include group name
- description << md->groupName() << "." <<
md->tagName();
- else
-



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ef90c8e7e17e2c1df924df7ce530b7bc5926c84a), Ladislav Hagara, 01/13/2011

Archive powered by MHonArc 2.6.24.

Top of Page