public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/partio/files/
Date: Mon, 22 Mar 2021 14:05:08 +0000 (UTC)	[thread overview]
Message-ID: <1616421763.4d15110d2673942e9f51c2fcc345aac413894a77.juippis@gentoo> (raw)

commit:     4d15110d2673942e9f51c2fcc345aac413894a77
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Mar 22 08:46:08 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 14:02:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d15110d

media-libs/partio: remove unused patch(es)

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20052
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/partio-1.1.0-Rename-partconv.patch       | 65 ----------------------
 1 file changed, 65 deletions(-)

diff --git a/media-libs/partio/files/partio-1.1.0-Rename-partconv.patch b/media-libs/partio/files/partio-1.1.0-Rename-partconv.patch
deleted file mode 100644
index 35f7c1244f3..00000000000
--- a/media-libs/partio/files/partio-1.1.0-Rename-partconv.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 7042285af5491fd3c2727fa24a7fd44145c066e5 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Sat, 23 Sep 2017 16:43:37 +0100
-Subject: [PATCH] Rename partconv to partconvert to avoid file collisions
-
-* partconv is the name of a program used by Crystal Space
-
-Closes: https://bugs.gentoo.org/631834
----
- README.md                                  | 2 +-
- src/Makefile                               | 2 +-
- src/tools/CMakeLists.txt                   | 6 +++---
- src/tools/{partconv.cpp => partconvert.cpp} | 0
- 4 files changed, 5 insertions(+), 5 deletions(-)
- rename src/tools/{partconv.cpp => partconvert.cpp} (100%)
-
-diff --git a/README.md b/README.md
-index 0a3ac19..4cd12c3 100644
---- a/README.md
-+++ b/README.md
-@@ -56,7 +56,7 @@ src/
-    doc/      Doxygen documentation and (the start of) a manual
-    tests/    Start of regression tests (I need more)
-    tools/    Useful tools 
--             partconv <input format> <output format>
-+             partconvert <input format> <output format>
-              partinfo <particle file>
-              partview <particle file>
- 
-diff --git a/src/Makefile b/src/Makefile
-index 0ced80e..ca4f965 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -25,4 +25,4 @@ reader/BGEO.o: reader/BGEO.cpp Particle.h ParticleSimple.h \
- reader/PDB.o: reader/PDB.cpp Particle.h ParticleSimple.h \
-   reader/../Particle.h reader/pdb.h
- partinfo.o: partinfo.cpp Particle.h
--partconv.o: partconf.cpp Particle.h
-\ No newline at end of file
-+partconvert.o: partconf.cpp Particle.h
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index 7a6d26b..b4ed9ae 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -47,10 +47,10 @@ ENDIF(GLUT_FOUND AND OPENGL_FOUND)
- ADD_EXECUTABLE(partinfo partinfo.cpp)
- target_link_libraries(partinfo ${PARTIO_LIBRARIES})
- 
--ADD_EXECUTABLE(partconv partconv.cpp)
--target_link_libraries(partconv ${PARTIO_LIBRARIES})
-+ADD_EXECUTABLE(partconvert partconvert.cpp)
-+target_link_libraries(partconvert ${PARTIO_LIBRARIES})
- 
- ADD_EXECUTABLE(partattr partattr.cpp)
- target_link_libraries(partattr ${PARTIO_LIBRARIES})
- 
--install(TARGETS partattr partconv partinfo DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(TARGETS partattr partconvert partinfo DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/tools/partconv.cpp b/src/tools/partconvert.cpp
-similarity index 100%
-rename from src/tools/partconv.cpp
-rename to src/tools/partconvert.cpp
--- 
-2.14.1
-


                 reply	other threads:[~2021-03-22 14:05 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1616421763.4d15110d2673942e9f51c2fcc345aac413894a77.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox